Tilastointievästeiden keräämää tietoa käytetään verkkosivuston kehittämiseen.
Date: Wed, 20 Nov 2024 10:12:40 +0200
Subject: [PATCH 02/23] Update
eu_cookie_compliance.cookie_category.statistics.yml
---
.../fi/eu_cookie_compliance.cookie_category.statistics.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/conf/cmi/language/fi/eu_cookie_compliance.cookie_category.statistics.yml b/conf/cmi/language/fi/eu_cookie_compliance.cookie_category.statistics.yml
index 661c3aca..b4707d04 100644
--- a/conf/cmi/language/fi/eu_cookie_compliance.cookie_category.statistics.yml
+++ b/conf/cmi/language/fi/eu_cookie_compliance.cookie_category.statistics.yml
@@ -1,4 +1,4 @@
description:
value: 'Tilastointievästeiden keräämää tietoa käytetään verkkosivuston kehittämiseen.
Nimi Tarjoaja Tarkoitus Voimassa Tyyppi nmstat www.hel.fi Siteimproven tilastointieväste kerää tietoa kävijän sivujen käytöstä. 1000 päivää _pk_id.* www.hel.fi Matomo-tilastointijärjestelmän eväste. 393 päivää _pk_ses.141.89f6 www.hel.fi - 1 tunti _pk_id.* kartta.hel.fi Matomo-tilastointijärjestelmän eväste. 393 päivää _pk_ses.* kartta.hel.fi Matomo-tilastointijärjestelmän eväste. 1 tunti _pk_id.* palvelukartta.hel.fi Matomo-tilastointijärjestelmän eväste. 393 päivää _pk_ses.* palvelukartta.hel.fi Matomo-tilastointijärjestelmän eväste. 1 tunti _pk_id.* avustukset.hel.fi Matomo-tilastointijärjestelmän eväste. 393 päivää _pk_ses.* avustukset.hel.fi Matomo-tilastointijärjestelmän eväste. 1 tunti rnsbid reactandshare.com Askem-reaktionappien toimintaan liittyvä tietue. - Local storage rnsbid_ts reactandshare.com Askem-reaktionappien toimintaan liittyvä tietue. - Local storage rns_reaction_* reactandshare.com Askem-reaktionappien toimintaan liittyvä tietue. - Local storage YSC youtube.com YouTuben eväste mahdollistaa videoiden upottamisen sivustolle. Istunto Kolmas osapuoli
The chats on the www.hel.fi website require functional chat cookies to function. By using a chat, you automatically accept the functional cookies it requires. No separate cookie consent is needed. Functional chat cookies are only downloaded to your device if you start a chat.
Name Provider Purpose of the cookie Validity Type _genesys.widgets.* www.hel.fi Used for storing data required by the chat functionality. Session leijuke.* www.hel.fi Used for storing data required by the chat functionality. Session aiap-wbc-chat-app-button-state www.hel.fi Used for chat app functionality. Stores chat app button settings and configuration data. Session aiap-chat-app-v1-state www.hel.fi Used for chat app functionality. Stores chat app settings and configuration data. Session conversationToken https://coh-chat-app-prod.ow6i4n9pdzm.eu-de.codeengine.appdomain.cloud Used for chat app functionality. Stores chat app conversation token for authentication and data access purposes. Session Third party CallGuide.language www.hel.fi ACE Chat: The language used in the ACE Web SDK is derived from the browsers' preferred language setting and ACE Web SDK settings. - Local storage CallGuide.config_services_* www.hel.fi ACE Chat: Configuring customer service integrations on a web page. Reduces web traffic when loading and navigating a page - Local storage *_CGWebSDK_windowGUID wds.ace.teliacompany.com ACE Chat: The unique identity of this browser window. Is used if the browser has more than one open window for a website - Local storage *_CGWebSDK_videoShower wds.ace.teliacompany.com ACE Chat: Only one window at a time can display video. This information tracks which of them (if any). - Local storage *_CGWebSDK_videoClients wds.ace.teliacompany.com ACE Chat: A list of all windows that are likely to display the video - Local storage *_ACEChatState_ActiveClient wds.ace.teliacompany.com ACE Chat: A website can have more than one chat client. This item tracks which customer the current chat belongs to. - Local storage *_chatEntrance wds.ace.teliacompany.com ACE Chat: Name of the chat entrance to the system - Local storage *_chatUID wds.ace.teliacompany.com ACE Chat: Chat session ID when communicating with ACE - Local storage humany-* www.hel.fi ACE Chat: Preserves widget status when page reloads - Local storage ARRAffinity .hel.humany.net ACE Chat: Load balancing in the backend system Session Third party ARRAffinitySameSite .hel.humany.net ACE Chat: Load balancing in the backend system Session Third party
Essential cookies help to make the website usable by allowing basic functions, navigating the page and using the protected areas of the site. The website will not work properly without these cookies and their consent is not required.
Name Provider Purpose of the cookie Validity Type cookiehub cookiehub.com Used by CookieHub to store information about whether visitors have given or declined the use of cookie categories used on the www.hel.fi site. 365 days cookie-agreed www.hel.fi Used by www.hel.fi Drupal to store information about whether visitors have given or declined the use of cookie categories used on the www.hel.fi site. 100 days cookie-agreed-version www.hel.fi Used by www.hel.fi Drupal to store information about what version of the cookie consent the user has agreed to. 100 days cookie-agreed-categories www.hel.fi Used by www.hel.fi Drupal to store information about what cookie categories the user has agreed to. 100 days cookie-agreed avustukset.hel.fi Used by avustukset.hel.fi Drupal to store information about whether visitors have given or declined the use of cookie categories used on the avustukset.hel.fi site. 100 days cookie-agreed-version avustukset.hel.fi Used by avustukset.hel.fi Drupal to store information about what version of the cookie consent the user has agreed to. 100 days cookie-agreed-categories avustukset.hel.fi Used by avustukset.hel.fi Drupal to store information about what cookie categories the user has agreed to. 100 days SSESS* www.hel.fi A cookie related to the operation of the content management system. 23 days SSESS* avustukset.hel.fi A cookie related to the operation of the content management system. 23 days AWSELBCORS siteimproveanalytics.io The cookie is related to a load distribution function used to direct requests to servers with the least traffic. Session Third party mtm_cookie_consent kartta.hel.fi A technical cookie that stores information about how you responded to the notice in the cookie banner about the use of cookies. 10950 days JSESSIONID helsinkikanava.fi
coh-chat-app-prod.eu-de.mybluemix.net
The cookie is an obligatory cookie that facilitates visiting the website. Session Third party JSESSIONID coh-chat-app-prod.ow6i4n9pdzm.eu-de.codeengine.appdomain.cloud Used for chat app functionality. Its value is used to access session data on server of the application. Session Third party COOKIE_SUPPORT helsinkikanava.fi The cookie facilitates managing cookies on the website. 365 days Third party GUEST_LANGUAGE_ID helsinkikanava.fi This cookie is generated by the Liferay, its function is to store the language preferences. 365 days Third party helfi-settings www.hel.fi Used by www.hel.fi Drupal to store information about closed announcements and accordions'' state. - Local storage Drupal.visitor.autologout_login avustukset.hel.fi Used by avustukset.hel.fi Drupal to automatically logout user after a period of inactivity. 365 days Drupal.gin.sidebarExpanded.desktop www.hel.fi Stores whether the admin sidebar is expanded or collapsed on desktop when logged in as an editor on hel.fi. - Local storage Drupal.gin.sidebarExpanded.mobile www.hel.fi Stores whether the admin sidebar is expanded or collapsed on mobile when logged in as an editor on hel.fi. - Local storage Drupal.gin.darkmode www.hel.fi Stores the user''s dark mode preference in the admin theme when logged in as an editor on hel.fi. - Local storage Drupal.toolbar.subtrees.* www.hel.fi Stores the expanded or collapsed state of submenus in the Drupal admin toolbar for a logged-in editor, ensuring consistency across page loads. - Local storage Drupal.off-canvas.css.* www.hel.fi Stores cached CKEditor CSS in localStorage for a logged-in editor, using a key with a cache-busting query to ensure the latest CSS is loaded. - Local storage ed11ySeen www.hel.fi Tracks which accessibility issues a logged-in editor has already seen to avoid duplicate notifications. - Local storage editoria11yResultCount www.hel.fi Tracks the number of accessibility issues found on specific pages for a logged-in editor, helping monitor and address them. - Local storage Drupal.toolbar.toolbarState www.hel.fi Stores the state of the admin toolbar for a logged-in editor, including its orientation, active tab and state of expansion. Session Session storage escapeAdminPath www.hel.fi Stores the URL to redirect a logged-in editor from the admin interface back to the main site. Session Session storage
Preference cookies modify the visuals and functions of the website based on the user''s previous sessions.
Name Provider Purpose of the cookie Validity Type httpskartta.hel.fi.SWCulture kartta.hel.fi The City''s map service cookie saves the language in which the service is used. 1826 days icareus-device helsinkikanava.fi The Helsinki Channel video server cookie facilitates including videos as part of the website''s content. 365 days Third party VISITOR_INFO1_LIVE youtube.com The YouTube cookie selects the old or new video player depending on the connection speed. 180 days Third party CONSENT youtube.com Used by Google to store user consent preferences 5947 days, 15 hours Third party activeTab www.hel.fi Used for storing active tab data when user is using high school search. Session activeContent www.hel.fi Used for storing active content data when user is using high school search. Session
The information collected by statistics cookies is used for developing the website.
Name Provider Purpose of the cookie Validity Type nmstat www.hel.fi The Siteimprove statistics cookie collects information about the use of the website. 1000 days _pk_id.* www.hel.fi Matomo Analytics - used to store a few details about the user such as the unique visitor ID 393 days _pk_ses.141.89f6 www.hel.fi - 1 hour _pk_id.* kartta.hel.fi Matomo Analytics - used to store a few details about the user such as the unique visitor ID 393 days _pk_ses.* kartta.hel.fi Matomo Analytics - short lived cookies used to temporarily store data for the visit 1 hour _pk_id.* palvelukartta.hel.fi Matomo Analytics - used to store a few details about the user such as the unique visitor ID 393 days _pk_ses.* palvelukartta.hel.fi Matomo Analytics - short lived cookies used to temporarily store data for the visit 1 hour _pk_id.* avustukset.hel.fi Matomo Analytics - used to store a few details about the user such as the unique visitor ID 393 days _pk_ses.* avustukset.hel.fi Matomo Analytics - short lived cookies used to temporarily store data for the visit 1 hour rnsbid reactandshare.com A record related to the operation of the
Askem
react buttons.
- Local storage rnsbid_ts reactandshare.com A record related to the operation of the
Askem
react buttons.
- Local storage rns_reaction_* reactandshare.com A record related to the operation of the
Askem
react buttons.
- Local storage YSC youtube.com The YouTube cookie facilitates including videos as part of the website''s content. Session Third party
Hel.fi uses cookies \r\n\r\nWe use essential cookies on our website to make the site work. Also third party cookies are used if you give us your permission.
\r\n"
- format: full_html
-mobile_popup_info:
- value: ''
- format: full_html
-popup_info_template: new
-popup_agree_button_message: Accept
-popup_more_info_button_message: 'Show cookies'
-mobile_breakpoint: 768
-popup_agreed_enabled: false
-popup_hide_agreed: false
-disagree_button_label: 'No, thanks'
-popup_agreed:
- value: 'Thank you for accepting cookies You can now hide this message or find out more about cookies.
'
- format: full_html
-popup_find_more_button_message: 'Show cookies'
-popup_hide_button_message: Hide
-popup_link: /cookie-information-and-settings
-popup_link_new_window: false
-popup_height: null
-popup_width: ''
-popup_delay: 1000
-show_more_info: true
-popup_bg_hex: ''
-popup_text_hex: ''
-domain: ''
-domains_option: 1
-domains_list: ''
-exclude_paths: "/admin\r\n/admin/*\r\n/batch\r\n/node/add*\r\n/node/*/*\r\n/user/*/*"
-exclude_admin_theme: false
-cookie_session: 0
-set_cookie_session_zero_on_disagree: 0
-cookie_lifetime: 100
-use_mobile_message: false
-use_bare_css: true
-use_olivero_css: false
-disagree_do_not_show_popup: false
-reload_page: true
-reload_options: 0
-reload_routes_list: ''
-cookie_name: ''
-exclude_uid_1: false
-better_support_for_screen_readers: false
-method: categories
-disabled_javascripts: ''
-automatic_cookies_removal: true
-allowed_cookies: "helfi_accordions_open\r\nessential:AWSELBCORS\r\nessential:cookiehub\r\nessential:mtm_cookie_consent\r\nessential:JSESSIONID\r\nessential:COOKIE_SUPPORT\r\nessential:GUEST_LANGUAGE_ID\r\npreference:httpskartta.hel.fi.SWCulture\r\npreference:icareus-device\r\npreference:VISITOR_INFO1_LIVE\r\npreference:CONSENT\r\nstatistics:nmstat\r\nstatistics:_pk_id.*\r\nstatistics:_pk_ses.141.89f6\r\nstatistics:_pk_id.*\r\nstatistics:_pk_ses.*\r\nstatistics:_pk_id.*\r\nstatistics:_pk_ses.*\r\nstatistics:rnsbid\r\nstatistics:rnsbid_ts\r\nstatistics:rns_reaction_*\r\nstatistics:YSC\r\nchat:_genesys.widgets.*\r\nchat:leijuke.*"
-consent_storage_method: do_not_store
-withdraw_message:
- value: 'Hel.fi uses cookies You have given your consent for us to set cookies.
'
- format: full_html
-withdraw_tab_button_label: 'Privacy settings'
-withdraw_action_button_label: 'Withdraw consent'
-withdraw_enabled: false
-withdraw_button_on_info_popup: false
-save_preferences_button_label: 'Accept selected cookies'
-accept_all_categories_button_label: 'Accept all cookies'
-enable_save_preferences_button: true
-domain_all_sites: true
-settings_tab_enabled: false
-containing_element: body
-cookie_policy_version: 1.2.5
-cookie_value_disagreed: '0'
-cookie_value_agreed_show_thank_you: '1'
-cookie_value_agreed: '2'
-accessibility_focus: false
-close_button_action: close_banner
-reject_button_label: ''
-reject_button_enabled: false
-close_button_enabled: false
diff --git a/conf/cmi/hdbt_cookie_banner.settings.yml b/conf/cmi/hdbt_cookie_banner.settings.yml
new file mode 100644
index 00000000..fae82ee6
--- /dev/null
+++ b/conf/cmi/hdbt_cookie_banner.settings.yml
@@ -0,0 +1,6 @@
+_core:
+ default_config_hash: y-QliARbuZ0u4VXlTAbsDzeY15OrDBGBbaP6LtSPb3c
+langcode: en
+cookie_information:
+ title: 'Cookie information'
+ content: "A cookie is a small-scale data storage program that a computer browser installs on a user's computer hard drive. Whenever the user's browser retrieves the site from the City of Helsinki's servers, the message is sent back to the user's computer. Javascript and server logs are used to record, for example, the number of users, country of use, usage time and browser used, as well as the content that the visitor has visited. The cookie does not damage the drive.\r\n\r\nCookies are used to speed up, analyze and develop the website and to target content to each user."
diff --git a/conf/cmi/helfi_eu_cookie_compliance.cookie_consent_intro.yml b/conf/cmi/helfi_eu_cookie_compliance.cookie_consent_intro.yml
deleted file mode 100644
index 368a0db9..00000000
--- a/conf/cmi/helfi_eu_cookie_compliance.cookie_consent_intro.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-_core:
- default_config_hash: eVNvfbEgjm25gLyG5DH8zDbCi17xs8djPZt0XHD_Q9s
-cc:
- title: 'Cookie settings'
- content:
- value: "A cookie is a small-scale data storage program that a computer browser installs on a user's computer hard drive. Whenever the user's browser retrieves the site from the City of Helsinki's servers, the message is sent back to the user's computer. Javascript and server logs are used to record, for example, the number of users, country of use, usage time and browser used, as well as the content that the visitor has visited. The cookie does not damage the drive.
Cookies are used to speed up, analyze and develop the website and to target content to each user.
"
- format: full_html
diff --git a/conf/cmi/language/fi/eu_cookie_compliance.cookie_category.chat.yml b/conf/cmi/language/fi/eu_cookie_compliance.cookie_category.chat.yml
deleted file mode 100644
index b554bf87..00000000
--- a/conf/cmi/language/fi/eu_cookie_compliance.cookie_category.chat.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-description:
- value: 'Toiminnallisten chat-evästeiden avulla mahdollistetaan helfi-sivujen chattien toiminta. Jos aloitat chatin, hyväksyt sen käyttöön liittyvät toiminnalliset evästeet automaattisesti. Evästeiden hyväksymiseen ei tällöin tarvita erillistä suostumusta. Toiminnallisia chat-evästeitä ladataan laitteellesi vain, jos käynnistät chatin.
Nimi Tarjoaja Tarkoitus Voimassa Tyyppi _genesys.widgets.* www.hel.fi Käytetään chatin tarvitseman datan tallentamiseen. Istunto leijuke.* www.hel.fi Käytetään chatin tarvitseman datan tallentamiseen. Istunto aiap-wbc-chat-app-button-state www.hel.fi Käytetään chat-sovellustoiminnallisuutta varten. Säilyttää chat-sovelluksen painikkeen asetukset ja kokoonpanotiedot. Istunto aiap-chat-app-v1-state www.hel.fi Käytetään chat-sovellustoiminnallisuutta varten. Säilyttää chat-sovelluksen asetukset ja kokoonpanotiedot. Istunto conversationToken https://coh-chat-app-prod.ow6i4n9pdzm.eu-de.codeengine.appdomain.cloud Käytetään chat-sovellustoiminnallisuutta varten. Säilyttää chat-sovelluksen keskustelutunnisteen istunnnon tunnistamista ja tietojen hakemista varten. Istunto Kolmas osapuoli CallGuide.language www.hel.fi ACE Chat: ACE Web SDK:ssa käytettävä kieli, joka on johdettu selainten ensisijaisesta kieliasetuksesta ja ACE Web SDK - asetuksista. - Local storage CallGuide.config_services_* www.hel.fi ACE Chat: Asiakaspalveluintegraatioiden määritys verkkosivulla. Vähentää verkkoliikennettä sivun lataamisen ja navigoinnin yhteydessä. - Local storage *_CGWebSDK_windowGUID wds.ace.teliacompany.com ACE Chat: Tämän selainikkunan yksilöllinen identiteetti. Käytetään, jos selaimessa on useampi kuin yksi avoin ikkuna verkkosivustolle. - Local storage *_CGWebSDK_videoShower wds.ace.teliacompany.com ACE Chat: Vain yksi ikkuna kerrallaan voi näyttää videota. Nämä tiedot seuraavat, mikä niistä (jos sellainen on). - Local storage *_CGWebSDK_videoClients wds.ace.teliacompany.com ACE Chat: Luettelo kaikista ikkunoista, jotka ovat todennäköisiä videon näyttämiseen. - Local storage *_ACEChatState_ActiveClient wds.ace.teliacompany.com ACE Chat: Verkkosivustolla voi olla useampi kuin yksi chat-asiakasohjelma. Tämä kohde seuraa, mihin asiakkaaseen nykyinen chat kuuluu. - Local storage *_chatEntrance wds.ace.teliacompany.com ACE Chat: Järjestelmän chat-sisäänkäynnin nimi - Local storage *_chatUID wds.ace.teliacompany.com ACE Chat: Keskustelun istuntotunnus kommunikoitaessa ACE:n kanssa - Local storage humany-* www.hel.fi ACE Chat: Säilyttää widgetin tilan, kun sivu ladataan uudelleen - Local storage ARRAffinity .hel.humany.net ACE Chat: Kuormituksen tasaus taustajärjestelmässä Istunto Kolmas osapuoli ARRAffinitySameSite .hel.humany.net ACE Chat: Kuormituksen tasaus taustajärjestelmässä Istunto Kolmas osapuoli
Välttämättömät evästeet auttavat tekemään verkkosivustosta käyttökelpoisen sallimalla perustoimintoja, kuten sivulla siirtymisen ja sivuston suojattujen alueiden käytön. Verkkosivusto ei toimi kunnolla ilman näitä evästeitä eikä niihin tarvita suostumusta.
Nimi Tarjoaja Tarkoitus Voimassa Tyyppi cookiehub Cookiehub Mahdollistaa evästehallinnan www.hel.fi sivuilla. 365 päivää cookie-agreed www.hel.fi Sivusto käyttää tätä evästettä tietojen tallentamiseen siitä, ovatko kävijät antaneet hyväksyntänsä tai kieltäytyneet evästeiden käytöstä. 100 päivää cookie-agreed-version www.hel.fi Tähän evästeeseen tallennetaan käyttäjän hyväksymän evästeselosteen versio. 100 päivää cookie-agreed-categories www.hel.fi Tähän evästeeseen on tallennettu käyttäjän hyväksymät evästekategoriat. 100 päivää cookie-agreed avustukset.hel.fi Sivusto käyttää tätä evästettä tietojen tallentamiseen siitä, ovatko kävijät antaneet hyväksyntänsä tai kieltäytyneet evästeiden käytöstä. 100 päivää cookie-agreed-version avustukset.hel.fi Tähän evästeeseen tallennetaan käyttäjän hyväksymän evästeselosteen versio. 100 päivää cookie-agreed-categories avustukset.hel.fi Tähän evästeeseen on tallennettu käyttäjän hyväksymät evästekategoriat. 100 päivää SSESS* www.hel.fi Sisällönhallintajärjestelmän toimintaan liittyvä eväste. 23 päivää SSESS* avustukset.hel.fi Sisällönhallintajärjestelmän toimintaan liittyvä eväste. 23 päivää AWSELBCORS siteimproveanalytics.io Eväste liittyy palvelinten kuormanjakotoiminnallisuuteen, jolla ohjataan pyynnöt vähimmällä käytöllä olevalle palvelimille. Istunto Kolmas osapuoli mtm_cookie_consent kartta.hel.fi Tekninen eväste johon talletetaan tieto valinnastasi evästeiden käytöstä kertovan bannerin kohdalla 10950 päivää JSESSIONID helsinkikanava.fi
coh-chat-app-prod.eu-de.mybluemix.net
Sivuston pakollinen eväste mahdollistaa kävijän vierailun sivustolla. Istunto Kolmas osapuoli JSESSIONID coh-chat-app-prod.ow6i4n9pdzm.eu-de.codeengine.appdomain.cloud Käytetään chat-sovellustoiminnallisuutta varten. Evästettä käytetään sovelluksen palvelimella olevan istuntotiedon hakemiseen. Istunto Kolmas osapuoli COOKIE_SUPPORT helsinkikanava.fi Mahdollistaa evästeiden hallinnan sivustolla. 365 päivää Kolmas osapuoli GUEST_LANGUAGE_ID helsinkikanava.fi Tämän evästeen on luonut Liferay, se tallentaa kieliasetukset. 365 päivää Kolmas osapuoli helfi-settings www.hel.fi Sivusto käyttää tätä tietuetta tietojen tallentamiseen siitä, mitä poikkeusilmoituksia on suljettu ja mikä on avattavien sisältöalueiden tila. - Local storage Drupal.visitor.autologout_login avustukset.hel.fi Käytetään käyttäjän automaattiseen uloskirjautumiseen. 365 päivää Drupal.gin.sidebarExpanded.desktop www.hel.fi Tallentaa tiedon sisällöntuottajan käyttöliittymän sivupalkin näkyvyydestä työpöytänäkymässä. - Local storage Drupal.gin.sidebarExpanded.mobile www.hel.fi Tallentaa tiedon sisällöntuottajan käyttöliittymän sivupalkin näkyvyydestä mobiilinäkymässä. - Local storage Drupal.gin.darkmode www.hel.fi Tallentaa tiedon sisällöntuottajan valitsemasta "tumma tila"-asetuksesta. - Local storage Drupal.toolbar.subtrees.* www.hel.fi Tallentaa sisällöntuottajan näkymissä alivalikoiden tilan (laajennettu tai kutistettu), jotta se säilyy yhdenmukaisena sivulatausten välillä. - Local storage Drupal.off-canvas.css.* www.hel.fi Tallentaa sisällöntuottajan käyttämän wysiwyg-editorin tyylit välimuistiin varmistaakseen viimeisimpien CSS-tyylien latauksen. - Local storage ed11ySeen www.hel.fi Tallentaa sisällöntuottajan näkemät saavutettavuusongelmat, jotta vältetään ongelmien kaksoisilmoitukset. - Local storage editoria11yResultCount www.hel.fi Tallentaa löydettyjen saavutettavuusongelmien määrän sisällöntuottajalle, auttaen seuraamaan ja korjaamaan ne. - Local storage Drupal.toolbar.toolbarState www.hel.fi Tallentaa sisällöntuottajan hallintatyökalupalkin orientaation, aktiivisen välilehden ja laajennustilan. Istunto Session storage escapeAdminPath www.hel.fi Tallentaa URL-osoitteen, jota käytetään ohjaamaan kirjautunut sisällöntuottaja hallintaliittymästä takaisin pääsivustolle. Istunto Session storage
Mieltymysevästeet mukauttavat sivuston ulkoasua ja toimintaa käyttäjän aiemman käytön perusteella.
Nimi Tarjoaja Tarkoitus Voimassa Tyyppi httpskartta.hel.fi.SWCulture kartta.hel.fi Kaupungin karttapalvelun evästeeseen tallennetaan kieli, jolla palvelua käytetään. 1826 päivää icareus-device helsinkikanava.fi Helsinki-kanavan videopalvelimen eväste. 365 päivää Kolmas osapuoli VISITOR_INFO1_LIVE youtube.com YouTuben eväste valitsee yhteyden nopeuden mukaan, joko vanhan tai uuden videosoittimen. 180 päivää Kolmas osapuoli CONSENT youtube.com Googlen eväste tallentaa kävijän evästehyväskynnän. 5947 päivää, 15 tuntia Kolmas osapuoli activeTab www.hel.fi Käytetään aktiivisten välilehtien tietojen tallentamiseen, kun käyttäjä käyttää lukioiden suodatushakua. Istunto activeContent www.hel.fi Käytetään aktiivisen sisältötietojen tallentamiseen, kun käyttäjä käyttää lukioiden hakua. Istunto
Tilastointievästeiden keräämää tietoa käytetään verkkosivuston kehittämiseen.
Nimi Tarjoaja Tarkoitus Voimassa Tyyppi nmstat www.hel.fi Siteimproven tilastointieväste kerää tietoa kävijän sivujen käytöstä. 1000 päivää _pk_id.* www.hel.fi Matomo-tilastointijärjestelmän eväste. 393 päivää _pk_ses.141.89f6 www.hel.fi - 1 tunti _pk_id.* kartta.hel.fi Matomo-tilastointijärjestelmän eväste. 393 päivää _pk_ses.* kartta.hel.fi Matomo-tilastointijärjestelmän eväste. 1 tunti _pk_id.* palvelukartta.hel.fi Matomo-tilastointijärjestelmän eväste. 393 päivää _pk_ses.* palvelukartta.hel.fi Matomo-tilastointijärjestelmän eväste. 1 tunti _pk_id.* avustukset.hel.fi Matomo-tilastointijärjestelmän eväste. 393 päivää _pk_ses.* avustukset.hel.fi Matomo-tilastointijärjestelmän eväste. 1 tunti rnsbid reactandshare.com Askem-reaktionappien toimintaan liittyvä tietue. - Local storage rnsbid_ts reactandshare.com Askem-reaktionappien toimintaan liittyvä tietue. - Local storage rns_reaction_* reactandshare.com Askem-reaktionappien toimintaan liittyvä tietue. - Local storage YSC youtube.com YouTuben eväste mahdollistaa videoiden upottamisen sivustolle. Istunto Kolmas osapuoli
Hel.fi käyttää evästeitä Tämä sivusto käyttää välttämättömiä evästeitä suorituskyvyn varmistamiseksi sekä yleisen käytön seurantaan. Lisäksi käytämme kohdennusevästeitä käyttäjäkokemuksen parantamiseksi, analytiikkaan ja kohdistetun sisällön näyttämiseen.
'
-popup_link: /cookie-information-and-settings
-disagree_button_label: 'Ei kiitos'
-withdraw_tab_button_label: Tietosuoja-asetukset
-save_preferences_button_label: 'Hyväksy valitut evästeet'
-accept_all_categories_button_label: 'Hyväksy kaikki evästeet'
diff --git a/conf/cmi/language/fi/hdbt_cookie_banner.settings.yml b/conf/cmi/language/fi/hdbt_cookie_banner.settings.yml
new file mode 100644
index 00000000..26d5fef4
--- /dev/null
+++ b/conf/cmi/language/fi/hdbt_cookie_banner.settings.yml
@@ -0,0 +1,3 @@
+cookie_information:
+ title: Evästeasetukset
+ content: "Eväste (engl. cookie) on pienikokoinen tekstitiedosto, jonka verkkoselain tallentaa käyttäjän tietokoneelle tai mobiililaitteelle, kun vierailet verkkosivustolla. Se ei vahingoita käyttäjän laitetta tai tiedostoja. Evästeitä ei voi käyttää haittaohjelmien levittämiseen.\r\n\r\nEvästeistä saatava käyttäjätieto auttaa meitä varmistamaan sivuston teknisen toimivuuden ja parantamaan digitaalisten palveluidemme laatua. Niiden avulla voimme kehittää sivuston käyttäjäystävällisyyttä ja helpottaa tiedon löytymistä."
diff --git a/conf/cmi/language/fi/helfi_eu_cookie_compliance.cookie_consent_intro.yml b/conf/cmi/language/fi/helfi_eu_cookie_compliance.cookie_consent_intro.yml
deleted file mode 100644
index 8b78ae23..00000000
--- a/conf/cmi/language/fi/helfi_eu_cookie_compliance.cookie_consent_intro.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-cc:
- content:
- value: 'Eväste (engl. cookie) on pienikokoinen tekstitiedosto, jonka verkkoselain tallentaa käyttäjän tietokoneelle tai mobiililaitteelle, kun vierailet verkkosivustolla. Se ei vahingoita käyttäjän laitetta tai tiedostoja. Evästeitä ei voi käyttää haittaohjelmien levittämiseen.
'
- format: full_html
- title: Evästeasetukset
diff --git a/conf/cmi/language/ru/eu_cookie_compliance.cookie_category.statistics.yml b/conf/cmi/language/ru/eu_cookie_compliance.cookie_category.statistics.yml
deleted file mode 100644
index a680c536..00000000
--- a/conf/cmi/language/ru/eu_cookie_compliance.cookie_category.statistics.yml
+++ /dev/null
@@ -1 +0,0 @@
-label: Статистика
diff --git a/conf/cmi/language/ru/eu_cookie_compliance.settings.yml b/conf/cmi/language/ru/eu_cookie_compliance.settings.yml
deleted file mode 100644
index 315eded2..00000000
--- a/conf/cmi/language/ru/eu_cookie_compliance.settings.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-popup_agreed:
- value: "Thank you for accepting cookies \r\n\r\nYou can now hide this message or find out more about cookies.
\r\n"
-popup_agree_button_message: Принять
-popup_more_info_button_message: 'Show cookies'
-popup_find_more_button_message: 'Show cookies'
-popup_hide_button_message: Скрыть
-popup_info:
- value: "Hel.fi uses cookies \r\n\r\nWe use essential cookies on our website to make the site work. Also third party cookies are used if you give us your permission.
\r\n"
-popup_link: /node/1
-withdraw_message:
- value: "Hel.fi uses cookies \r\n\r\nYou have given your consent for us to set cookies.
\r\n"
-save_preferences_button_label: 'Accept selected cookies'
diff --git a/conf/cmi/language/sv/eu_cookie_compliance.cookie_category.chat.yml b/conf/cmi/language/sv/eu_cookie_compliance.cookie_category.chat.yml
deleted file mode 100644
index 9715a41b..00000000
--- a/conf/cmi/language/sv/eu_cookie_compliance.cookie_category.chat.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-description:
- value: 'Chattarna på webbplatsen www.hel.fi fungerar med hjälp av funktionella chattkakor. Om du inleder en chatt godkänner du automatiskt de nödvändiga funktionella kakorna. Då behövs inget separat samtycke till kakor. Funktionella chattkakor laddas endast ner på din enhet om du inleder en chatt.
Namn Tjänsteleverantör Cookie syfte Giltighet Typ _genesys.widgets.* www.hel.fi Används för att lagra data som behövs för chatten. session leijuke.* www.hel.fi Används för att lagra data som behövs för chatten. session aiap-wbc-chat-app-button-state www.hel.fi Används för chattapplikationens funktionalitet. Lagrar inställningar och konfigurationsdata för chattapplikationens knapp. session aiap-chat-app-v1-state www.hel.fi Används för chattapplikationens funktionalitet. Lagrar inställningar och konfigurationsdata för chattapplikationen. session conversationToken https://coh-chat-app-prod.ow6i4n9pdzm.eu-de.codeengine.appdomain.cloud Används för chattapplikationens funktionalitet. Lagrar konversationstoken för autentisering och åtkomst till dataändamål. session Tredje part CallGuide.language www.hel.fi ACE Chat: Språket som används i ACE Web SDK härleds från webbläsarnas föredragna språkinställning och ACE Web SDK-inställningar. - Local storage CallGuide.config_services_* www.hel.fi ACE Chatt: Konfigurera kundtjänstintegrationer på en webbsida. Minskar webbtrafiken när du läser in och navigerar på en sida. - Local storage *_CGWebSDK_windowGUID wds.ace.teliacompany.com ACE Chatt: Den unika identiteten för det här webbläsarfönstret. Används om webbläsaren har mer än ett öppet fönster för en webbplats. - Local storage *_CGWebSDK_videoShower wds.ace.teliacompany.com ACE Chatt: Endast ett fönster i taget kan visa video. Den här informationen spårar vilka av dem (om några). - Local storage *_CGWebSDK_videoClients wds.ace.teliacompany.com ACE Chatt: En lista över alla fönster som sannolikt kommer att visa videon. - Local storage *_ACEChatState_ActiveClient wds.ace.teliacompany.com ACE Chatt: En webbplats kan ha mer än en chattklient. Det här objektet spårar vilken kund den aktuella chatten tillhör. - Local storage *_chatEntrance wds.ace.teliacompany.com ACE Chatt: Namnet på chattingången till systemet - Local storage *_chatUID wds.ace.teliacompany.com ACE Chatt: Chattsessions-ID vid kommunikation med ACE - Local storage humany-* www.hel.fi ACE Chatt: Bevarar widgetstatus när sidan laddas om - Local storage ARRAffinity .hel.humany.net ACE Chatt: Lastbalansering i backend-systemet Session Tredje part ARRAffinitySameSite .hel.humany.net ACE Chatt: Lastbalansering i backend-systemet Session Tredje part
Nödvändiga cookies hjälper till att göra webbplatsen användbar genom att tillåta grundläggande funktioner som att navigera på sidan och använda de skyddade områdena på webbplatsen. Webbplatsen fungerar inte korrekt utan dessa cookies och kräver inte samtycke.
Namn Tjänsteleverantör Cookie syfte Giltighet Typ cookiehub cookiehub.com Cookie möjliggör hantering av cookies på www.hel.fi webbplatsen. 365 dagar cookie-agreed www.hel.fi Cookie möjliggör hantering av cookies på webbplatsen. 100 dagar cookie-agreed-version www.hel.fi Används för att lagra information om versionen av cookies samtycke som användaren har godkänt. 100 dagar cookie-agreed-categories www.hel.fi Används för att lagra information om vilka cookie -kategorier användaren har godkänt. 100 dagar cookie-agreed avustukset.hel.fi Cookie möjliggör hantering av cookies på webbplatsen. 100 dagar cookie-agreed-version avustukset.hel.fi Används för att lagra information om versionen av cookies samtycke som användaren har godkänt. 100 dagar cookie-agreed-categories avustukset.hel.fi Används för att lagra information om vilka cookie -kategorier användaren har godkänt. 100 dagar SSESS* www.hel.fi En cookie relaterad till driften av innehållshanteringssystemet. 23 dagar SSESS* avustukset.hel.fi En cookie relaterad till driften av innehållshanteringssystemet. 23 dagar AWSELBCORS siteimproveanalytics.io Cookie är kopplad till funktionen för lastfördelning som styr begäran till en server med mindre belastning. session Tredje part mtm_cookie_consent kartta.hel.fi A technical cookie that stores information about how you responded to the notice in the cookie banner about the use of cookies. 10950 dagar JSESSIONID helsinkikanava.fi
coh-chat-app-prod.eu-de.mybluemix.net
Kakan är en obligatorisk kaka som gör det möjligt för besökaren att besöka webbplatsen. session Tredje part JSESSIONID coh-chat-app-prod.ow6i4n9pdzm.eu-de.codeengine.appdomain.cloud Används för chattapplikationens funktionalitet. Dess värde används för att få tillgång till sessiondata på applikationens server. session Tredje part COOKIE_SUPPORT helsinkikanava.fi Kakan möjliggör hanteringen av kakor på webbplatsen. 365 dagar Tredje part GUEST_LANGUAGE_ID helsinkikanava.fi Denna cookie genereras av Liferay, dess funktion är att lagra språkinställningarna. 365 dagar Tredje part helfi-settings www.hel.fi Används av www.hel.fi Drupal för att lagra information om stängda meddelanden och accordions'' tillstånd. - Local storage Drupal.visitor.autologout_login avustukset.hel.fi Används av avustukset.hel.fi Drupal för att automatiskt logga ut användare efter en period av inaktivitet. 365 dagar Drupal.gin.sidebarExpanded.desktop www.hel.fi Lagrar om admin-sidopanelen är expanderad eller kollapsad på skrivbordet när du är inloggad som redaktör på hel.fi. - Local storage Drupal.gin.sidebarExpanded.mobile www.hel.fi Lagrar om admin-sidopanelen är expanderad eller kollapsad på mobil när du är inloggad som redaktör på hel.fi. - Local storage Drupal.gin.darkmode www.hel.fi Lagrar användarens mörkt läge-inställning i admin-temat när du är inloggad som redaktör på hel.fi. - Local storage Drupal.toolbar.subtrees.* www.hel.fi Lagrar tillståndet för expanderade eller kollapsade undermenyer i Drupals admin-verktygsfält för en inloggad redaktör, vilket säkerställer konsekvens mellan sidladdningar. - Local storage Drupal.off-canvas.css.* www.hel.fi Lagrar cachelagrad CKEditor CSS i localStorage för en inloggad redaktör, med en nyckel som använder en cache-brytande fråga för att säkerställa att den senaste CSS-filen laddas. - Local storage ed11ySeen www.hel.fi Spårar vilka tillgänglighetsproblem en inloggad redaktör redan har sett för att undvika dubbla aviseringar. - Local storage editoria11yResultCount www.hel.fi Spårar antalet tillgänglighetsproblem som hittats på specifika sidor för en inloggad redaktör, vilket hjälper till att övervaka och åtgärda dem. - Local storage Drupal.toolbar.toolbarState www.hel.fi Lagrar tillståndet för admin-verktygsfältet för en inloggad redaktör, inklusive dess orientering, aktiva flik och expanderade tillstånd. Session Session storage escapeAdminPath www.hel.fi Lagrar URL för att omdirigera en inloggad redaktör från admin-gränssnittet tillbaka till huvudsidan. - Session storage
Preferenscookies ändrar webbplatsens utseende och funktioner enligt användarens tidigare användning.
Namn Tjänsteleverantör Cookie syfte Giltighet Typ httpskartta.hel.fi.SWCulture kartta.hel.fi I kakan på stadens kaktjänst sparas det språk som användaren använder i tjänsten. 1826 dagar icareus-device helsinkikanava.fi Helsinki-kanavas kaka gör det möjligt att göra videor till en del av innehållet på webbplatsen. 365 dagar Tredje part VISITOR_INFO1_LIVE youtube.com YouTubes kaka väljer antingen den nya eller gamla videospelaren enligt förbindelsens hastighet. 180 dagar Tredje part CONSENT youtube.com Används av Google för att lagra inställningar för användarens samtycke. 5947 dagar, 15 timmar Tredje part activeTab www.hel.fi Används för att lagra aktiv flikdata när användaren använder gymnasiesökning. Session activeContent www.hel.fi Används för att lagra aktivt innehållsdata när användaren använder gymnasiesökning. Session
'
- format: full_html
diff --git a/conf/cmi/language/sv/eu_cookie_compliance.cookie_category.statistics.yml b/conf/cmi/language/sv/eu_cookie_compliance.cookie_category.statistics.yml
deleted file mode 100644
index 92e0cd64..00000000
--- a/conf/cmi/language/sv/eu_cookie_compliance.cookie_category.statistics.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-description:
- value: 'De uppgifter statistikkakorna samlar in används för att utveckla webbplatsen.
Namn Tjänsteleverantör Cookie syfte Giltighet Typ nmstat www.hel.fi Siteimproves kaka samlar information om hur webbplatsen används. 1000 dagar _pk_id.* www.hel.fi Matomo-statistiksystemets kaka samlar information om hur webbplatsen används. 393 dagar _pk_ses.141.89f6 www.hel.fi - 1 timme _pk_id.* kartta.hel.fi Matomo-statistiksystemets kaka samlar information om hur webbplatsen används. 393 dagar _pk_ses.* kartta.hel.fi Matomo-statistiksystemets kaka samlar information om hur webbplatsen används. 1 timme _pk_id.* palvelukartta.hel.fi Matomo-statistiksystemets kaka samlar information om hur webbplatsen används. 393 dagar _pk_ses.* palvelukartta.hel.fi Matomo-statistiksystemets kaka samlar information om hur webbplatsen används. 1 timme _pk_id.* avustukset.hel.fi Matomo-statistiksystemets kaka samlar information om hur webbplatsen används. 393 dagar _pk_ses.* avustukset.hel.fi Matomo-statistiksystemets kaka samlar information om hur webbplatsen används. 1 timme rnsbid reactandshare.com En post relaterad till driften av reaktionsknappen
Askem
.
- Local storage rnsbid_ts reactandshare.com En post relaterad till driften av reaktionsknappen
Askem
.
- Local storage rns_reaction_* reactandshare.com En post relaterad till driften av reaktionsknappen
Askem
.
- Local storage YSC youtube.com YouTubes kaka gör det möjligt att göra videor till en del av innehållet på webbplatsen. session Tredje part
'
- format: full_html
-label: Statistik
diff --git a/conf/cmi/language/sv/eu_cookie_compliance.settings.yml b/conf/cmi/language/sv/eu_cookie_compliance.settings.yml
deleted file mode 100644
index df981cb7..00000000
--- a/conf/cmi/language/sv/eu_cookie_compliance.settings.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-popup_agree_button_message: Accepterar
-popup_more_info_button_message: 'Visa cookies'
-popup_find_more_button_message: 'Visa cookies'
-popup_hide_button_message: Dölj
-popup_info:
- value: 'Hel.fi använder cookies Vi använder viktiga cookies på vår webbplats för att få webbplatsen att fungera. Även tredjepartscookies används om du ger oss ditt tillstånd.
'
-disagree_button_label: 'Nej, tack'
-withdraw_action_button_label: 'Återkalla samtycke'
-withdraw_tab_button_label: Sekretessinställningar
-save_preferences_button_label: 'Acceptera valda cookies'
-accept_all_categories_button_label: 'Acceptera alla cookies'
diff --git a/conf/cmi/language/sv/hdbt_cookie_banner.settings.yml b/conf/cmi/language/sv/hdbt_cookie_banner.settings.yml
new file mode 100644
index 00000000..e079a63d
--- /dev/null
+++ b/conf/cmi/language/sv/hdbt_cookie_banner.settings.yml
@@ -0,0 +1,3 @@
+cookie_information:
+ title: 'Cookie -inställningar'
+ content: "En kaka (eng. cookie) är en liten textfil som webbläsaren sparar i användarens dator eller mobila enhet när hen besöker en webbplats. Den skadar inte användarens enhet eller filer. Kakor kan inte användas för att sprida skadeprogram.\r\n\r\nAnvändarinformationen som fås från kakorna hjälper oss att säkerställa webbplatsens funktionalitet och förbättra kvaliteten på våra digitala tjänster. Med hjälp av dem kan vi utveckla webbplatsens användarvänlighet och göra det lättare att hitta information."
diff --git a/conf/cmi/language/sv/helfi_eu_cookie_compliance.cookie_consent_intro.yml b/conf/cmi/language/sv/helfi_eu_cookie_compliance.cookie_consent_intro.yml
deleted file mode 100644
index 46d695ef..00000000
--- a/conf/cmi/language/sv/helfi_eu_cookie_compliance.cookie_consent_intro.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-cc:
- content:
- value: 'En kaka (eng. cookie) är en liten textfil som webbläsaren sparar i användarens dator eller mobila enhet när hen besöker en webbplats. Den skadar inte användarens enhet eller filer. Kakor kan inte användas för att sprida skadeprogram.
'
- format: full_html
- title: 'Cookie -inställningar'
diff --git a/conf/cmi/user.role.admin.yml b/conf/cmi/user.role.admin.yml
index 0649d059..72af063e 100644
--- a/conf/cmi/user.role.admin.yml
+++ b/conf/cmi/user.role.admin.yml
@@ -27,9 +27,9 @@ dependencies:
- content_translation
- editoria11y
- entity_usage
- - eu_cookie_compliance
- file
- filter
+ - hdbt_cookie_banner
- helfi_api_base
- helfi_tpr
- locale
@@ -74,8 +74,7 @@ permissions:
- 'access tpr_unit overview'
- 'access user profiles'
- 'administer blocks'
- - 'administer eu cookie compliance categories'
- - 'administer eu cookie compliance popup'
+ - 'administer hdbt_cookie_banner'
- 'administer menu'
- 'administer nodes'
- 'administer paragraphs library'
diff --git a/conf/cmi/user.role.anonymous.yml b/conf/cmi/user.role.anonymous.yml
index dd32146e..78ea20dc 100644
--- a/conf/cmi/user.role.anonymous.yml
+++ b/conf/cmi/user.role.anonymous.yml
@@ -5,7 +5,6 @@ dependencies:
config:
- rest.resource.helfi_global_mobile_menu
module:
- - eu_cookie_compliance
- external_entities
- helfi_api_base
- helfi_tpr
@@ -21,7 +20,6 @@ weight: 0
is_admin: false
permissions:
- 'access content'
- - 'display eu cookie compliance popup'
- 'restful get helfi_global_mobile_menu'
- 'send javascript errors to sentry'
- 'view helfi_announcements external entity'
diff --git a/conf/cmi/user.role.authenticated.yml b/conf/cmi/user.role.authenticated.yml
index a6836aa0..0b8ea0da 100644
--- a/conf/cmi/user.role.authenticated.yml
+++ b/conf/cmi/user.role.authenticated.yml
@@ -5,7 +5,6 @@ dependencies:
config:
- rest.resource.helfi_global_mobile_menu
module:
- - eu_cookie_compliance
- external_entities
- file
- helfi_api_base
@@ -28,7 +27,6 @@ permissions:
- 'access toolbar'
- 'delete own files'
- 'disable own tfa'
- - 'display eu cookie compliance popup'
- 'restful get helfi_global_mobile_menu'
- 'send javascript errors to sentry'
- 'setup own tfa'
From b5c66f78068298ffffd8c5b116cca04edd6fa6f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?=
Date: Fri, 22 Nov 2024 09:19:37 +0200
Subject: [PATCH 04/23] Added fallback to EU cookie compliance module.
---
public/themes/custom/hdbt_subtheme/hdbt_subtheme.theme | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/public/themes/custom/hdbt_subtheme/hdbt_subtheme.theme b/public/themes/custom/hdbt_subtheme/hdbt_subtheme.theme
index 33d47533..1c131ccb 100644
--- a/public/themes/custom/hdbt_subtheme/hdbt_subtheme.theme
+++ b/public/themes/custom/hdbt_subtheme/hdbt_subtheme.theme
@@ -108,6 +108,12 @@ function hdbt_subtheme_preprocess_paragraph__journey_planner(array &$variables):
// Set the privacy policy URL.
/** @var \Drupal\hdbt_cookie_banner\Services\CookieSettings $cookie_settings */
- $cookie_settings = \Drupal::service('hdbt_cookie_banner.cookie_settings');
- $variables['privacy_policy_url'] = $cookie_settings->getCookieSettingsPageUrl();
+ if (Drupal::moduleHandler()->moduleExists('hdbt_cookie_banner')) {
+ $cookie_settings = Drupal::service('hdbt_cookie_banner.cookie_settings');
+ $variables['privacy_policy_url'] = $cookie_settings->getCookieSettingsPageUrl();
+ }
+ // @todo UHF-10862 Remove once the HDBT cookie banner module is in use.
+ elseif (Drupal::moduleHandler()->moduleExists('helfi_eu_cookie_compliance')) {
+ $variables['privacy_policy_url'] = helfi_eu_cookie_compliance_get_privacy_policy_url();
+ }
}
From d804af9ad76cdf6bd76f107ee3bc57d5f839558f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?=
Date: Fri, 22 Nov 2024 09:26:32 +0200
Subject: [PATCH 05/23] Removed PHPDoc tag.
---
public/themes/custom/hdbt_subtheme/hdbt_subtheme.theme | 1 -
1 file changed, 1 deletion(-)
diff --git a/public/themes/custom/hdbt_subtheme/hdbt_subtheme.theme b/public/themes/custom/hdbt_subtheme/hdbt_subtheme.theme
index 1c131ccb..35ae023b 100644
--- a/public/themes/custom/hdbt_subtheme/hdbt_subtheme.theme
+++ b/public/themes/custom/hdbt_subtheme/hdbt_subtheme.theme
@@ -107,7 +107,6 @@ function hdbt_subtheme_preprocess_paragraph__journey_planner(array &$variables):
$variables['media_id'] = 'journey-map';
// Set the privacy policy URL.
- /** @var \Drupal\hdbt_cookie_banner\Services\CookieSettings $cookie_settings */
if (Drupal::moduleHandler()->moduleExists('hdbt_cookie_banner')) {
$cookie_settings = Drupal::service('hdbt_cookie_banner.cookie_settings');
$variables['privacy_policy_url'] = $cookie_settings->getCookieSettingsPageUrl();
From 6f875204b65eaaa64944fcf91159a7629d66e5fa Mon Sep 17 00:00:00 2001
From: hel-platta-automation
<95360595+hel-platta-automation@users.noreply.github.com>
Date: Fri, 22 Nov 2024 12:58:55 +0000
Subject: [PATCH 06/23] Update configuration
---
composer.lock | 28 +++++++++++++++-------------
1 file changed, 15 insertions(+), 13 deletions(-)
diff --git a/composer.lock b/composer.lock
index c084e0ad..39d61128 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4075,16 +4075,16 @@
},
{
"name": "drupal/hdbt",
- "version": "6.8.9",
+ "version": "6.8.10",
"source": {
"type": "git",
"url": "https://github.com/City-of-Helsinki/drupal-hdbt.git",
- "reference": "01dac91a676828e19a6ace8b6e53a9e2a4c26b7a"
+ "reference": "2427bb6c2988c157285e685308e16f0c66e8d5e1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/01dac91a676828e19a6ace8b6e53a9e2a4c26b7a",
- "reference": "01dac91a676828e19a6ace8b6e53a9e2a4c26b7a",
+ "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/2427bb6c2988c157285e685308e16f0c66e8d5e1",
+ "reference": "2427bb6c2988c157285e685308e16f0c66e8d5e1",
"shasum": ""
},
"require": {
@@ -4103,10 +4103,10 @@
"Drupal"
],
"support": {
- "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.8.9",
+ "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.8.10",
"issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues"
},
- "time": "2024-11-20T13:11:33+00:00"
+ "time": "2024-11-22T12:52:59+00:00"
},
{
"name": "drupal/hdbt_admin",
@@ -4204,16 +4204,16 @@
},
{
"name": "drupal/helfi_api_base",
- "version": "2.7.15",
+ "version": "2.7.17",
"source": {
"type": "git",
"url": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base.git",
- "reference": "bfada1ee33120497e8dde6dbde201320f41e2dfc"
+ "reference": "d5d46f30b9ec1ccac5b5bac130097454232e35a8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/bfada1ee33120497e8dde6dbde201320f41e2dfc",
- "reference": "bfada1ee33120497e8dde6dbde201320f41e2dfc",
+ "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/d5d46f30b9ec1ccac5b5bac130097454232e35a8",
+ "reference": "d5d46f30b9ec1ccac5b5bac130097454232e35a8",
"shasum": ""
},
"require": {
@@ -4235,7 +4235,9 @@
"dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
"dg/bypass-finals": "^1.0",
"donatj/mock-webserver": "dev-master",
- "drupal/coder": "^8.3"
+ "drupal/coder": "^8.3",
+ "drupal/elasticsearch_connector": "^8.0@alpha",
+ "drupal/search_api": "^1.0"
},
"type": "drupal-module",
"license": [
@@ -4243,10 +4245,10 @@
],
"description": "Helfi - API Base",
"support": {
- "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.7.15",
+ "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.7.17",
"issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/issues"
},
- "time": "2024-11-08T08:31:53+00:00"
+ "time": "2024-11-22T08:27:20+00:00"
},
{
"name": "drupal/helfi_azure_fs",
From 6181db573405eeb3e4986743c049729032e4c0aa Mon Sep 17 00:00:00 2001
From: actions-bot
Date: Sun, 24 Nov 2024 12:07:00 +0000
Subject: [PATCH 07/23] Updated node modules based on npm audit fix
---
.../themes/custom/hdbt_subtheme/package-lock.json | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/public/themes/custom/hdbt_subtheme/package-lock.json b/public/themes/custom/hdbt_subtheme/package-lock.json
index 798141a4..b27ca16c 100644
--- a/public/themes/custom/hdbt_subtheme/package-lock.json
+++ b/public/themes/custom/hdbt_subtheme/package-lock.json
@@ -3731,9 +3731,10 @@
}
},
"node_modules/cross-spawn": {
- "version": "7.0.3",
- "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
- "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+ "version": "7.0.6",
+ "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+ "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
+ "license": "MIT",
"dependencies": {
"path-key": "^3.1.0",
"shebang-command": "^2.0.0",
@@ -13479,9 +13480,9 @@
}
},
"cross-spawn": {
- "version": "7.0.3",
- "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
- "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+ "version": "7.0.6",
+ "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+ "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
"requires": {
"path-key": "^3.1.0",
"shebang-command": "^2.0.0",
From 37bc918da60707b73d114044d22e73250bffd8c4 Mon Sep 17 00:00:00 2001
From: tuutti <771113+tuutti@users.noreply.github.com>
Date: Tue, 26 Nov 2024 06:59:26 +0000
Subject: [PATCH 08/23] Update configuration
---
compose.yaml | 5 +-
composer.lock | 126 +++++++++---------
...form_display.node.landing_page.default.yml | 2 +-
conf/cmi/search_api.index.districts.yml | 4 +-
...search_api.index.districts_for_filters.yml | 2 +-
conf/cmi/search_api.index.project_phases.yml | 2 +-
conf/cmi/search_api.index.project_themes.yml | 2 +-
conf/cmi/search_api.index.project_types.yml | 2 +-
conf/cmi/search_api.index.projects.yml | 6 +-
conf/cmi/search_api.index.street_data.yml | 3 +-
conf/cmi/views.view.er_tpr_unit.yml | 2 +-
conf/cmi/views.view.locked_services.yml | 2 +-
conf/cmi/views.view.locked_units.yml | 2 +-
conf/cmi/views.view.service_list.yml | 4 +-
conf/cmi/views.view.service_units.yml | 2 +-
conf/cmi/views.view.unit_search.yml | 2 +-
docker/openshift/crons/menu-queue.sh | 17 +++
docker/openshift/crons/revision-queue.sh | 11 ++
public/sites/default/settings.php | 34 ++---
19 files changed, 129 insertions(+), 101 deletions(-)
create mode 100644 docker/openshift/crons/menu-queue.sh
create mode 100644 docker/openshift/crons/revision-queue.sh
diff --git a/compose.yaml b/compose.yaml
index c680d449..8e5cc53e 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -151,13 +151,12 @@ services:
- search
artemis:
container_name: "${COMPOSE_PROJECT_NAME}-artemis"
- image: quay.io/artemiscloud/activemq-artemis-broker
- environment:
- AMQ_EXTRA_ARGS: "--user admin --password admin"
+ image: apache/activemq-artemis
depends_on:
- app
networks:
- internal
+ - stonehenge-network
profiles:
- queue
chromium:
diff --git a/composer.lock b/composer.lock
index 39d61128..c9a8c2f7 100644
--- a/composer.lock
+++ b/composer.lock
@@ -2259,16 +2259,16 @@
},
{
"name": "drupal/core",
- "version": "10.3.9",
+ "version": "10.3.10",
"source": {
"type": "git",
"url": "https://github.com/drupal/core.git",
- "reference": "42a6516491b4793158542a2326dc6ad1fe2aa5bd"
+ "reference": "3ebb71e9c4ef0c13f683353547551fca49f9a144"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/drupal/core/zipball/42a6516491b4793158542a2326dc6ad1fe2aa5bd",
- "reference": "42a6516491b4793158542a2326dc6ad1fe2aa5bd",
+ "url": "https://api.github.com/repos/drupal/core/zipball/3ebb71e9c4ef0c13f683353547551fca49f9a144",
+ "reference": "3ebb71e9c4ef0c13f683353547551fca49f9a144",
"shasum": ""
},
"require": {
@@ -2417,13 +2417,13 @@
],
"description": "Drupal is an open source content management platform powering millions of websites and applications.",
"support": {
- "source": "https://github.com/drupal/core/tree/10.3.9"
+ "source": "https://github.com/drupal/core/tree/10.3.10"
},
- "time": "2024-11-20T17:59:45+00:00"
+ "time": "2024-11-22T12:51:33+00:00"
},
{
"name": "drupal/core-composer-scaffold",
- "version": "10.3.9",
+ "version": "10.3.10",
"source": {
"type": "git",
"url": "https://github.com/drupal/core-composer-scaffold.git",
@@ -2467,7 +2467,7 @@
"drupal"
],
"support": {
- "source": "https://github.com/drupal/core-composer-scaffold/tree/10.3.9"
+ "source": "https://github.com/drupal/core-composer-scaffold/tree/10.3.10"
},
"time": "2024-08-22T14:31:34+00:00"
},
@@ -4302,17 +4302,20 @@
"source": {
"type": "git",
"url": "https://github.com/City-of-Helsinki/drupal-tools.git",
- "reference": "53ad81c4249c6dd38deea3f6014ad0b1be47f2db"
+ "reference": "3de6f884ac7de9a43fe242f371dcf9416cac47b2"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/53ad81c4249c6dd38deea3f6014ad0b1be47f2db",
- "reference": "53ad81c4249c6dd38deea3f6014ad0b1be47f2db",
+ "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/3de6f884ac7de9a43fe242f371dcf9416cac47b2",
+ "reference": "3de6f884ac7de9a43fe242f371dcf9416cac47b2",
"shasum": ""
},
"require": {
"drupal/helfi_api_base": "*",
- "drush/drush": "^11 || ^12 || ^13"
+ "drush/drush": "^12 || ^13"
+ },
+ "conflict": {
+ "drush/drush": "< 12.5"
},
"require-dev": {
"composer/installers": "^2",
@@ -4379,7 +4382,7 @@
"source": "https://github.com/City-of-Helsinki/drupal-tools/tree/main",
"issues": "https://github.com/City-of-Helsinki/drupal-tools/issues"
},
- "time": "2024-10-23T10:28:01+00:00"
+ "time": "2024-11-26T06:52:09+00:00"
},
{
"name": "drupal/helfi_navigation",
@@ -4417,16 +4420,16 @@
},
{
"name": "drupal/helfi_platform_config",
- "version": "4.8.0",
+ "version": "4.8.1",
"source": {
"type": "git",
"url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git",
- "reference": "d93cdc55e761665a2bb68503f466ab376a745c10"
+ "reference": "6c57a1041a22c37008822ea642ce63c763081369"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/d93cdc55e761665a2bb68503f466ab376a745c10",
- "reference": "d93cdc55e761665a2bb68503f466ab376a745c10",
+ "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/6c57a1041a22c37008822ea642ce63c763081369",
+ "reference": "6c57a1041a22c37008822ea642ce63c763081369",
"shasum": ""
},
"require": {
@@ -4495,7 +4498,7 @@
"ruflin/elastica": "^8.0"
},
"conflict": {
- "drupal/core": "<10.3",
+ "drupal/core": "<10.3.10",
"drupal/core-composer-scaffold": "<10.3",
"drupal/ctools": "<3.11 || ^4.0.1",
"drupal/default_content": ">2.0.0-alpha2",
@@ -4523,8 +4526,7 @@
"[#UHF-9388] Process configuration translation files for custom modules (https://www.drupal.org/i/2845437)": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/fd68277191b8f8ec290e53b5fbbae699b2260384/patches/drupal-2845437-process-custom-module-translation-config-10.3.x.patch",
"[#UHF-9690] Allow updating lists when switching from allowed values to allowed values function (https://www.drupal.org/i/2873353)": "https://www.drupal.org/files/issues/2021-05-18/allow-allowed-values-function-update-D9-2873353_1.patch",
"[#UHF-9952, #UHF-9980] Duplicate
Date: Tue, 26 Nov 2024 09:04:37 +0200
Subject: [PATCH 09/23] Removed compose profile
---
.env | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.env b/.env
index fca892d4..b7e918ac 100644
--- a/.env
+++ b/.env
@@ -7,7 +7,7 @@ COMPOSE_PROJECT_NAME=helfi-kymp
PROJECT_NAME=liikenne
# Default Docker compose profiles
-COMPOSE_PROFILES=search,queue
+COMPOSE_PROFILES=search
# OpenShift project name
OC_PROJECT_NAME=hki-kanslia-liikenne-test
From 363d14a6c559f7ada03cfcc0cdb4b7869feab242 Mon Sep 17 00:00:00 2001
From: tuutti
Date: Tue, 26 Nov 2024 09:21:19 +0200
Subject: [PATCH 10/23] UHF-9452: Updated required env variables
---
public/sites/default/all.settings.php | 3 +++
1 file changed, 3 insertions(+)
diff --git a/public/sites/default/all.settings.php b/public/sites/default/all.settings.php
index 260e6c53..d638f605 100644
--- a/public/sites/default/all.settings.php
+++ b/public/sites/default/all.settings.php
@@ -65,6 +65,9 @@
'ELASTIC_USER',
'ELASTIC_PASSWORD',
'SENTRY_DSN_REACT',
+ 'AMQ_BROKERS',
+ 'AMQ_USER',
+ 'AMQ_PASSWORD',
];
foreach ($additionalEnvVars as $var) {
$preflight_checks['environmentVariables'][] = $var;
From 256ffc463a2d91a95c3f9deca460348175fa3d82 Mon Sep 17 00:00:00 2001
From: hel-platta-automation
<95360595+hel-platta-automation@users.noreply.github.com>
Date: Tue, 26 Nov 2024 12:36:48 +0000
Subject: [PATCH 11/23] Update configuration
---
composer.lock | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/composer.lock b/composer.lock
index c9a8c2f7..88b1383b 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4420,16 +4420,16 @@
},
{
"name": "drupal/helfi_platform_config",
- "version": "4.8.1",
+ "version": "4.8.3",
"source": {
"type": "git",
"url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git",
- "reference": "6c57a1041a22c37008822ea642ce63c763081369"
+ "reference": "e6cde28156dbb1bb890b41e8a5c84d61f9102242"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/6c57a1041a22c37008822ea642ce63c763081369",
- "reference": "6c57a1041a22c37008822ea642ce63c763081369",
+ "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/e6cde28156dbb1bb890b41e8a5c84d61f9102242",
+ "reference": "e6cde28156dbb1bb890b41e8a5c84d61f9102242",
"shasum": ""
},
"require": {
@@ -4555,10 +4555,10 @@
],
"description": "HELfi platform config",
"support": {
- "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.8.1",
+ "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.8.3",
"issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues"
},
- "time": "2024-11-25T13:05:33+00:00"
+ "time": "2024-11-26T12:32:51+00:00"
},
{
"name": "drupal/helfi_proxy",
From a4fc9e7ad6ed0299b4a5f639345f0c8a931f2b70 Mon Sep 17 00:00:00 2001
From: Santeri Hurnanen
Date: Thu, 28 Nov 2024 12:24:56 +0200
Subject: [PATCH 12/23] Reuse getPropertyDefinitions from StreetDataDefinition
---
.../src/Plugin/DataType/StreetData.php | 16 +++++++-------
.../datasource/HelfiStreetDataSource.php | 21 ++-----------------
.../src/TypedData/StreetDataDefinition.php | 19 +++--------------
3 files changed, 14 insertions(+), 42 deletions(-)
diff --git a/public/modules/custom/helfi_kymp_content/src/Plugin/DataType/StreetData.php b/public/modules/custom/helfi_kymp_content/src/Plugin/DataType/StreetData.php
index 7c7163c2..345d3d64 100644
--- a/public/modules/custom/helfi_kymp_content/src/Plugin/DataType/StreetData.php
+++ b/public/modules/custom/helfi_kymp_content/src/Plugin/DataType/StreetData.php
@@ -4,19 +4,21 @@
namespace Drupal\helfi_kymp_content\Plugin\DataType;
+use Drupal\Core\StringTranslation\TranslatableMarkup;
+use Drupal\Core\TypedData\Attribute\DataType;
use Drupal\Core\TypedData\DataDefinition;
use Drupal\Core\TypedData\Plugin\DataType\Map;
+use Drupal\helfi_kymp_content\TypedData\StreetDataDefinition;
/**
* Street data type.
- *
- * @DataType(
- * id = "street_data",
- * label = @Translation("Street data"),
- * constraints = {},
- * definition_class = "\Drupal\helfi_kymp_content\TypedData\StreetDataDefinition"
- * )
*/
+#[DataType(
+ id: "street_data",
+ label: new TranslatableMarkup("Street data"),
+ definition_class: StreetDataDefinition::class,
+ constraints: [],
+)]
class StreetData extends Map {
/**
diff --git a/public/modules/custom/helfi_kymp_content/src/Plugin/search_api/datasource/HelfiStreetDataSource.php b/public/modules/custom/helfi_kymp_content/src/Plugin/search_api/datasource/HelfiStreetDataSource.php
index 9663086f..13c8fa16 100644
--- a/public/modules/custom/helfi_kymp_content/src/Plugin/search_api/datasource/HelfiStreetDataSource.php
+++ b/public/modules/custom/helfi_kymp_content/src/Plugin/search_api/datasource/HelfiStreetDataSource.php
@@ -6,8 +6,8 @@
use Drupal\Core\Language\LanguageInterface;
use Drupal\Core\TypedData\ComplexDataInterface;
-use Drupal\Core\TypedData\DataDefinition;
use Drupal\Core\TypedData\TypedDataTrait;
+use Drupal\helfi_kymp_content\Plugin\DataType\StreetData;
use Drupal\search_api\Datasource\DatasourceInterface;
use Drupal\search_api\Datasource\DatasourcePluginBase;
use GuzzleHttp\ClientInterface;
@@ -155,24 +155,7 @@ public function getItemLanguage(ComplexDataInterface $item): string {
* {@inheritdoc}
*/
public function getPropertyDefinitions(): array {
- $property_definition = [];
-
- $property_definition['id'] = DataDefinition::create('integer')
- ->setLabel('id')
- ->setRequired(TRUE);
- $property_definition['street_name'] = DataDefinition::create('string')
- ->setLabel('Street name')
- ->addConstraint('Range', ['min' => 0, 'max' => 255])
- ->setRequired(TRUE);
- $property_definition['length'] = DataDefinition::create('integer')
- ->setLabel('Length')
- ->setRequired(TRUE);
- $property_definition['maintenance_class'] = DataDefinition::create('integer')
- ->setLabel('Maintenance class')
- ->addConstraint('Range', ['min' => 0, 'max' => 5])
- ->setRequired(TRUE);
-
- return $property_definition;
+ return StreetData::propertyDefinitions();
}
}
diff --git a/public/modules/custom/helfi_kymp_content/src/TypedData/StreetDataDefinition.php b/public/modules/custom/helfi_kymp_content/src/TypedData/StreetDataDefinition.php
index 61a4cc2f..b120f9d0 100644
--- a/public/modules/custom/helfi_kymp_content/src/TypedData/StreetDataDefinition.php
+++ b/public/modules/custom/helfi_kymp_content/src/TypedData/StreetDataDefinition.php
@@ -5,7 +5,7 @@
namespace Drupal\helfi_kymp_content\TypedData;
use Drupal\Core\TypedData\ComplexDataDefinitionBase;
-use Drupal\Core\TypedData\DataDefinition;
+use Drupal\helfi_kymp_content\Plugin\DataType\StreetData;
/**
* The street data definition.
@@ -15,22 +15,9 @@ class StreetDataDefinition extends ComplexDataDefinitionBase {
/**
* {@inheritDoc}
*/
- public function getPropertyDefinitions() {
+ public function getPropertyDefinitions(): array {
if (!isset($this->propertyDefinitions)) {
- $this->propertyDefinitions['id'] = DataDefinition::create('integer')
- ->setLabel('id')
- ->setRequired(TRUE);
- $this->propertyDefinitions['street_name'] = DataDefinition::create('string')
- ->setLabel('Street name')
- ->addConstraint('Range', ['min' => 0, 'max' => 255])
- ->setRequired(TRUE);
- $this->propertyDefinitions['length'] = DataDefinition::create('integer')
- ->setLabel('Length')
- ->setRequired(TRUE);
- $this->propertyDefinitions['maintenance_class'] = DataDefinition::create('integer')
- ->setLabel('Maintenance class')
- ->addConstraint('Range', ['min' => 0, 'max' => 5])
- ->setRequired(TRUE);
+ $this->propertyDefinitions = StreetData::propertyDefinitions();
}
return $this->propertyDefinitions;
}
From b6f65c9bd261a060f5ee9cfbfcafd7afc694d02e Mon Sep 17 00:00:00 2001
From: Santeri Hurnanen
Date: Thu, 28 Nov 2024 13:54:54 +0200
Subject: [PATCH 13/23] Fix kartta api usage
Get street id from attribute instead of separate element
---
.../src/Plugin/DataType/StreetData.php | 2 +-
.../datasource/HelfiStreetDataSource.php | 25 +++++++++----------
2 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/public/modules/custom/helfi_kymp_content/src/Plugin/DataType/StreetData.php b/public/modules/custom/helfi_kymp_content/src/Plugin/DataType/StreetData.php
index 345d3d64..2523be41 100644
--- a/public/modules/custom/helfi_kymp_content/src/Plugin/DataType/StreetData.php
+++ b/public/modules/custom/helfi_kymp_content/src/Plugin/DataType/StreetData.php
@@ -27,7 +27,7 @@ class StreetData extends Map {
public static function propertyDefinitions(): array {
$properties = [];
- $properties['id'] = DataDefinition::create('integer')
+ $properties['id'] = DataDefinition::create('string')
->setLabel('id')
->setRequired(TRUE);
diff --git a/public/modules/custom/helfi_kymp_content/src/Plugin/search_api/datasource/HelfiStreetDataSource.php b/public/modules/custom/helfi_kymp_content/src/Plugin/search_api/datasource/HelfiStreetDataSource.php
index 13c8fa16..2e6fc6d3 100644
--- a/public/modules/custom/helfi_kymp_content/src/Plugin/search_api/datasource/HelfiStreetDataSource.php
+++ b/public/modules/custom/helfi_kymp_content/src/Plugin/search_api/datasource/HelfiStreetDataSource.php
@@ -11,6 +11,7 @@
use Drupal\search_api\Datasource\DatasourceInterface;
use Drupal\search_api\Datasource\DatasourcePluginBase;
use GuzzleHttp\ClientInterface;
+use GuzzleHttp\Exception\GuzzleException;
use Psr\Log\LoggerInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -79,7 +80,7 @@ public function loadMultiple(array $ids): array {
'typeName' => 'avoindata:YLRE_Katualue_alue',
'propertyname' => 'avoindata:kadun_nimi,avoindata:kayttotarkoitus,avoindata:yllapitoluokka,avoindata:pituus',
]);
- $uri = sprintf('%s?%s', 'https://kartta.hel.fi/ws/geoserver/avoindata/wfs', $query);
+ $uri = sprintf('%s?%s', self::API_URL, $query);
try {
$content = $this->client->request('GET', $uri);
@@ -88,7 +89,7 @@ public function loadMultiple(array $ids): array {
return [];
}
}
- catch (\Exception $e) {
+ catch (GuzzleException $e) {
$this->logger->error("Errors while fetching street data from kartta.hel.fi: {$e->getMessage()}");
return [];
}
@@ -105,16 +106,18 @@ public function loadMultiple(array $ids): array {
$data = [];
foreach ($doc->firstChild->firstChild->childNodes->getIterator() as $street_data) {
- $id = NULL;
- $single_street = [];
+ $id = $street_data->getAttribute('gml:id');
+
+ if (!$id || $ids && !in_array($id, $ids)) {
+ continue;
+ }
+
+ $single_street = [
+ 'id' => $id,
+ ];
foreach ($street_data->childNodes->getIterator() as $field) {
switch ($field->nodeName) {
- case 'avoindata:katualue_id':
- $id = $field->nodeValue;
- $single_street['id'] = $ids && $id && in_array($id, $ids) ? $id : NULL;
- break;
-
case 'avoindata:kadun_nimi':
$single_street['street_name'] = $field->nodeValue;
break;
@@ -130,10 +133,6 @@ public function loadMultiple(array $ids): array {
}
}
- if ($ids && $id && !in_array($id, $ids)) {
- continue;
- }
-
$street_data_definition = $this->getTypedDataManager()->createDataDefinition('street_data');
/** @var \Drupal\Core\TypedData\ComplexDataInterface $street_data */
$street_data = $this->getTypedDataManager()->create($street_data_definition);
From d1ed6098d255b07d28c3329071e57026cd27a485 Mon Sep 17 00:00:00 2001
From: Santeri Hurnanen
Date: Thu, 28 Nov 2024 13:58:31 +0200
Subject: [PATCH 14/23] Refactor street data api calls to separate service
---
.../helfi_kymp_content.services.yml | 6 +
.../datasource/HelfiStreetDataSource.php | 92 ++-------------
.../src/StreetDataService.php | 107 ++++++++++++++++++
3 files changed, 120 insertions(+), 85 deletions(-)
create mode 100644 public/modules/custom/helfi_kymp_content/src/StreetDataService.php
diff --git a/public/modules/custom/helfi_kymp_content/helfi_kymp_content.services.yml b/public/modules/custom/helfi_kymp_content/helfi_kymp_content.services.yml
index 7c9e87e8..1c473d04 100644
--- a/public/modules/custom/helfi_kymp_content/helfi_kymp_content.services.yml
+++ b/public/modules/custom/helfi_kymp_content/helfi_kymp_content.services.yml
@@ -1,4 +1,8 @@
services:
+ _defaults:
+ autowire: true
+ autoconfigure: true
+
logger.channel.helfi_kymp_content:
parent: logger.channel_base
arguments:
@@ -9,3 +13,5 @@ services:
arguments: ['@logger.channel.helfi_kymp_content']
tags:
- { name: event_subscriber }
+
+ Drupal\helfi_kymp_content\StreetDataService: ~
diff --git a/public/modules/custom/helfi_kymp_content/src/Plugin/search_api/datasource/HelfiStreetDataSource.php b/public/modules/custom/helfi_kymp_content/src/Plugin/search_api/datasource/HelfiStreetDataSource.php
index 2e6fc6d3..2d19893c 100644
--- a/public/modules/custom/helfi_kymp_content/src/Plugin/search_api/datasource/HelfiStreetDataSource.php
+++ b/public/modules/custom/helfi_kymp_content/src/Plugin/search_api/datasource/HelfiStreetDataSource.php
@@ -6,13 +6,10 @@
use Drupal\Core\Language\LanguageInterface;
use Drupal\Core\TypedData\ComplexDataInterface;
-use Drupal\Core\TypedData\TypedDataTrait;
use Drupal\helfi_kymp_content\Plugin\DataType\StreetData;
+use Drupal\helfi_kymp_content\StreetDataService;
use Drupal\search_api\Datasource\DatasourceInterface;
use Drupal\search_api\Datasource\DatasourcePluginBase;
-use GuzzleHttp\ClientInterface;
-use GuzzleHttp\Exception\GuzzleException;
-use Psr\Log\LoggerInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
/**
@@ -26,31 +23,17 @@
*/
class HelfiStreetDataSource extends DatasourcePluginBase implements DatasourceInterface {
- use TypedDataTrait;
-
- public const API_URL = 'https://kartta.hel.fi/ws/geoserver/avoindata/wfs';
-
/**
* The client.
- *
- * @var \GuzzleHttp\ClientInterface
- */
- protected ClientInterface $client;
-
- /**
- * The logger.
- *
- * @var \Psr\Log\LoggerInterface
*/
- protected LoggerInterface $logger;
+ protected StreetDataService $client;
/**
* {@inheritDoc}
*/
public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
$instance = parent::create($container, $configuration, $plugin_id, $plugin_definition);
- $instance->client = $container->get('http_client');
- $instance->logger = $container->get('logger.channel.helfi_kymp_content');
+ $instance->client = $container->get(StreetDataService::class);
return $instance;
}
@@ -73,74 +56,13 @@ public function load($id) {
* {@inheritdoc}
*/
public function loadMultiple(array $ids): array {
- $query = http_build_query([
- 'request' => 'GetFeature',
- 'service' => 'WFS',
- 'version' => '1.1.0',
- 'typeName' => 'avoindata:YLRE_Katualue_alue',
- 'propertyname' => 'avoindata:kadun_nimi,avoindata:kayttotarkoitus,avoindata:yllapitoluokka,avoindata:pituus',
- ]);
- $uri = sprintf('%s?%s', self::API_URL, $query);
-
- try {
- $content = $this->client->request('GET', $uri);
- $xmlResult = $content->getBody()->getContents();
- if (!$xmlResult) {
- return [];
- }
- }
- catch (GuzzleException $e) {
- $this->logger->error("Errors while fetching street data from kartta.hel.fi: {$e->getMessage()}");
- return [];
- }
-
- libxml_use_internal_errors(TRUE);
- $doc = new \DOMDocument(encoding: 'UTF-8');
- $doc->loadXML($xmlResult);
- $errors = libxml_get_errors();
-
- if ($errors) {
- $this->logger->error('Errors while parsing street data xml string.');
- return [];
- }
-
- $data = [];
- foreach ($doc->firstChild->firstChild->childNodes->getIterator() as $street_data) {
- $id = $street_data->getAttribute('gml:id');
-
- if (!$id || $ids && !in_array($id, $ids)) {
- continue;
- }
-
- $single_street = [
- 'id' => $id,
- ];
-
- foreach ($street_data->childNodes->getIterator() as $field) {
- switch ($field->nodeName) {
- case 'avoindata:kadun_nimi':
- $single_street['street_name'] = $field->nodeValue;
- break;
-
- case 'avoindata:pituus':
- $single_street['length'] = $field->nodeValue;
- break;
-
- case 'avoindata:yllapitoluokka':
- // Turn field value from III or II to 3 or 2 etc.
- $single_street['maintenance_class'] = strlen($field->nodeValue);
- break;
- }
- }
+ $streetData = $this->client->getStreetData();
- $street_data_definition = $this->getTypedDataManager()->createDataDefinition('street_data');
- /** @var \Drupal\Core\TypedData\ComplexDataInterface $street_data */
- $street_data = $this->getTypedDataManager()->create($street_data_definition);
- $street_data->setValue($single_street);
- $data[$id] = $street_data;
+ if ($ids) {
+ return array_intersect_key($streetData, array_flip($ids));
}
- return $data;
+ return $streetData;
}
/**
diff --git a/public/modules/custom/helfi_kymp_content/src/StreetDataService.php b/public/modules/custom/helfi_kymp_content/src/StreetDataService.php
new file mode 100644
index 00000000..644fd0f1
--- /dev/null
+++ b/public/modules/custom/helfi_kymp_content/src/StreetDataService.php
@@ -0,0 +1,107 @@
+ 'GetFeature',
+ 'service' => 'WFS',
+ 'version' => '1.1.0',
+ 'typeName' => 'avoindata:YLRE_Katualue_alue',
+ 'propertyname' => 'avoindata:kadun_nimi,avoindata:yllapitoluokka,avoindata:pituus',
+ ]);
+ $uri = sprintf('%s?%s', self::API_URL, $query);
+
+ try {
+ $content = $this->client->request('GET', $uri);
+ $xmlResult = $content->getBody()->getContents();
+ if (!$xmlResult) {
+ return [];
+ }
+ }
+ catch (GuzzleException $e) {
+ $this->logger->error("Errors while fetching street data from kartta.hel.fi: {$e->getMessage()}");
+ return [];
+ }
+
+ libxml_use_internal_errors(TRUE);
+ $doc = new \DOMDocument(encoding: 'UTF-8');
+ $doc->loadXML($xmlResult);
+ $errors = libxml_get_errors();
+
+ if ($errors) {
+ $this->logger->error('Errors while parsing street data xml string.');
+ return [];
+ }
+
+ $data = [];
+ foreach ($doc->firstChild->firstChild->childNodes->getIterator() as $street_data) {
+ $id = $street_data->getAttribute('gml:id');
+ if (!$id) {
+ continue;
+ }
+
+ $single_street = [
+ 'id' => $id,
+ ];
+
+ foreach ($street_data->childNodes->getIterator() as $field) {
+ switch ($field->nodeName) {
+ case 'avoindata:kadun_nimi':
+ $single_street['street_name'] = $field->nodeValue;
+ break;
+
+ case 'avoindata:pituus':
+ $single_street['length'] = $field->nodeValue;
+ break;
+
+ case 'avoindata:yllapitoluokka':
+ // Turn field value from III or II to 3 or 2 etc.
+ $single_street['maintenance_class'] = strlen($field->nodeValue);
+ break;
+ }
+ }
+
+ $street_data_definition = $this->typedDataManager->createDataDefinition('street_data');
+ /** @var \Drupal\Core\TypedData\ComplexDataInterface $street_data */
+ $street_data = $this->typedDataManager->create($street_data_definition);
+ $street_data->setValue($single_street);
+ $data[$id] = $street_data;
+ }
+
+ return $data;
+ }
+
+}
From 57b89c936ca88afb9469da2b5112dff1093549f1 Mon Sep 17 00:00:00 2001
From: Santeri Hurnanen
Date: Thu, 28 Nov 2024 15:26:56 +0200
Subject: [PATCH 15/23] UHF-11027: Add tests
---
composer.json | 2 +-
.../src/StreetDataService.php | 18 +++--
.../tests/fixtures/street_data.xml | 29 +++++++++
.../Kernel/Plugin/StreetDataSourceTest.php | 55 ++++++++++++++++
.../tests/src/Kernel/StreetDataTest.php | 65 +++++++++++++++++++
5 files changed, 162 insertions(+), 7 deletions(-)
create mode 100644 public/modules/custom/helfi_kymp_content/tests/fixtures/street_data.xml
create mode 100644 public/modules/custom/helfi_kymp_content/tests/src/Kernel/Plugin/StreetDataSourceTest.php
create mode 100644 public/modules/custom/helfi_kymp_content/tests/src/Kernel/StreetDataTest.php
diff --git a/composer.json b/composer.json
index 74d0b5c6..288743b7 100644
--- a/composer.json
+++ b/composer.json
@@ -116,7 +116,7 @@
"@lint-php",
"@test-php"
],
- "test-php": "vendor/bin/phpunit -c phpunit.xml.dist",
+ "test-php": "vendor/bin/phpunit -c $PWD/phpunit.xml.dist",
"lint-php": "vendor/bin/phpcs --standard=Drupal",
"copy-commit-message-script": "make copy-commit-message-script",
"post-install-cmd": [
diff --git a/public/modules/custom/helfi_kymp_content/src/StreetDataService.php b/public/modules/custom/helfi_kymp_content/src/StreetDataService.php
index 644fd0f1..9d728820 100644
--- a/public/modules/custom/helfi_kymp_content/src/StreetDataService.php
+++ b/public/modules/custom/helfi_kymp_content/src/StreetDataService.php
@@ -13,7 +13,7 @@
/**
* Service for fetching street data from kartta.hel.fi.
*/
-final readonly class StreetDataService {
+class StreetDataService {
public const API_URL = 'https://kartta.hel.fi/ws/geoserver/avoindata/wfs';
@@ -21,17 +21,17 @@
* Constructs a new StreetDataService instance.
*/
public function __construct(
- protected ClientInterface $client,
- protected TypedDataManagerInterface $typedDataManager,
+ protected readonly ClientInterface $client,
+ protected readonly TypedDataManagerInterface $typedDataManager,
#[Autowire(service: 'logger.channel.helfi_kymp_content')]
- protected LoggerInterface $logger,
+ protected readonly LoggerInterface $logger,
) {
}
/**
* Gets street data.
*
- * @return \Drupal\helfi_kymp_content\Plugin\DataType\StreetData[]
+ * @return array
* Street data.
*/
public function getStreetData(): array {
@@ -56,10 +56,12 @@ public function getStreetData(): array {
return [];
}
- libxml_use_internal_errors(TRUE);
+ $internal_errors = libxml_use_internal_errors(TRUE);
$doc = new \DOMDocument(encoding: 'UTF-8');
+ $doc->preserveWhiteSpace = FALSE;
$doc->loadXML($xmlResult);
$errors = libxml_get_errors();
+ libxml_use_internal_errors($internal_errors);
if ($errors) {
$this->logger->error('Errors while parsing street data xml string.');
@@ -68,6 +70,10 @@ public function getStreetData(): array {
$data = [];
foreach ($doc->firstChild->firstChild->childNodes->getIterator() as $street_data) {
+ if (!$street_data instanceof \DOMElement) {
+ continue;
+ }
+
$id = $street_data->getAttribute('gml:id');
if (!$id) {
continue;
diff --git a/public/modules/custom/helfi_kymp_content/tests/fixtures/street_data.xml b/public/modules/custom/helfi_kymp_content/tests/fixtures/street_data.xml
new file mode 100644
index 00000000..d7c30545
--- /dev/null
+++ b/public/modules/custom/helfi_kymp_content/tests/fixtures/street_data.xml
@@ -0,0 +1,29 @@
+
+
+
+
+ Suovakuja
+ Asuntokatu
+ I
+ 139.5
+
+
+ Rauhankatu
+ Asuntokatu
+ II
+ 130.3
+
+
+ Kruunuhaankatu
+ Asuntokatu
+ III
+ 72.4
+
+
+ Sammonkatu
+ Asuntokatu
+ III
+ 75.3
+
+
+
diff --git a/public/modules/custom/helfi_kymp_content/tests/src/Kernel/Plugin/StreetDataSourceTest.php b/public/modules/custom/helfi_kymp_content/tests/src/Kernel/Plugin/StreetDataSourceTest.php
new file mode 100644
index 00000000..72035dcd
--- /dev/null
+++ b/public/modules/custom/helfi_kymp_content/tests/src/Kernel/Plugin/StreetDataSourceTest.php
@@ -0,0 +1,55 @@
+ 'item1',
+ 'id2' => 'item2',
+ ];
+
+ $streetData = $this->prophesize(StreetDataService::class);
+
+ $streetData->getStreetData()
+ ->shouldBeCalled()
+ ->willReturn($items);
+
+ $this->container->set(StreetDataService::class, $streetData->reveal());
+
+ /** @var \Drupal\Component\Plugin\PluginManagerInterface $pluginManager */
+ $pluginManager = $this->container->get('plugin.manager.search_api.datasource');
+ $sut = $pluginManager->createInstance('helfi_street_data_source', []);
+
+ $this->assertInstanceOf(HelfiStreetDataSource::class, $sut);
+ $this->assertEquals('item1', $sut->load('id1'));
+ $this->assertEquals(NULL, $sut->load('does not exist'));
+ $this->assertEquals(['id1' => 'item1'], $sut->loadMultiple(['id1']));
+ $this->assertEquals($items, $sut->loadMultiple([]));
+ }
+
+}
diff --git a/public/modules/custom/helfi_kymp_content/tests/src/Kernel/StreetDataTest.php b/public/modules/custom/helfi_kymp_content/tests/src/Kernel/StreetDataTest.php
new file mode 100644
index 00000000..d9eb87dc
--- /dev/null
+++ b/public/modules/custom/helfi_kymp_content/tests/src/Kernel/StreetDataTest.php
@@ -0,0 +1,65 @@
+setupMockHttpClient([
+ new RequestException('test', new Request('GET', 'test')),
+ new Response(body: 'invalid-xml'),
+ new Response(body: file_get_contents(__DIR__ . '/../../fixtures/street_data.xml')),
+ ]);
+
+ $sut = $this->container->get(StreetDataService::class);
+
+ // RequestException response.
+ $data = $sut->getStreetData();
+ $this->assertEmpty($data);
+
+ // Invalid XML response.
+ $data = $sut->getStreetData();
+ $this->assertEmpty($data);
+
+ // Fixture response.
+ $data = $sut->getStreetData();
+ $this->assertNotEmpty($data);
+
+ foreach ($data as $id => $street) {
+ $this->assertInstanceOf(StreetData::class, $street);
+ $this->assertEquals($id, $street->get('id')->getValue());
+ }
+
+ $street = $data['YLRE_Katualue_alue.809'];
+ $this->assertNotEmpty($street);
+ $this->assertEquals('Kruunuhaankatu', $street->get('street_name')->getValue());
+ $this->assertEquals("72.4", $street->get('length')->getValue());
+ $this->assertEquals(3, $street->get('maintenance_class')->getValue());
+ }
+
+}
From 0a5c7512f3cb844bcb8015b3f16220d8ccbd32e5 Mon Sep 17 00:00:00 2001
From: hel-platta-automation
<95360595+hel-platta-automation@users.noreply.github.com>
Date: Fri, 29 Nov 2024 10:46:38 +0000
Subject: [PATCH 16/23] Update configuration
---
composer.lock | 299 +++++++++---------
...tem.paragraphs_library_item.paragraphs.yml | 2 +-
conf/cmi/social_media.settings.yml | 2 +-
3 files changed, 152 insertions(+), 151 deletions(-)
diff --git a/composer.lock b/composer.lock
index 88b1383b..11c1ae09 100644
--- a/composer.lock
+++ b/composer.lock
@@ -2352,29 +2352,29 @@
"extra": {
"drupal-scaffold": {
"file-mapping": {
- "[project-root]/.editorconfig": "assets/scaffold/files/editorconfig",
- "[project-root]/.gitattributes": "assets/scaffold/files/gitattributes",
- "[web-root]/.csslintrc": "assets/scaffold/files/csslintrc",
- "[web-root]/.eslintignore": "assets/scaffold/files/eslintignore",
- "[web-root]/.eslintrc.json": "assets/scaffold/files/eslintrc.json",
- "[web-root]/.ht.router.php": "assets/scaffold/files/ht.router.php",
"[web-root]/.htaccess": "assets/scaffold/files/htaccess",
- "[web-root]/example.gitignore": "assets/scaffold/files/example.gitignore",
- "[web-root]/index.php": "assets/scaffold/files/index.php",
- "[web-root]/INSTALL.txt": "assets/scaffold/files/drupal.INSTALL.txt",
"[web-root]/README.md": "assets/scaffold/files/drupal.README.md",
+ "[web-root]/index.php": "assets/scaffold/files/index.php",
+ "[web-root]/.csslintrc": "assets/scaffold/files/csslintrc",
"[web-root]/robots.txt": "assets/scaffold/files/robots.txt",
"[web-root]/update.php": "assets/scaffold/files/update.php",
"[web-root]/web.config": "assets/scaffold/files/web.config",
+ "[web-root]/INSTALL.txt": "assets/scaffold/files/drupal.INSTALL.txt",
+ "[web-root]/.eslintignore": "assets/scaffold/files/eslintignore",
+ "[web-root]/.eslintrc.json": "assets/scaffold/files/eslintrc.json",
+ "[web-root]/.ht.router.php": "assets/scaffold/files/ht.router.php",
"[web-root]/sites/README.txt": "assets/scaffold/files/sites.README.txt",
+ "[project-root]/.editorconfig": "assets/scaffold/files/editorconfig",
+ "[web-root]/example.gitignore": "assets/scaffold/files/example.gitignore",
+ "[web-root]/themes/README.txt": "assets/scaffold/files/themes.README.txt",
+ "[project-root]/.gitattributes": "assets/scaffold/files/gitattributes",
+ "[web-root]/modules/README.txt": "assets/scaffold/files/modules.README.txt",
+ "[web-root]/profiles/README.txt": "assets/scaffold/files/profiles.README.txt",
+ "[web-root]/sites/example.sites.php": "assets/scaffold/files/example.sites.php",
"[web-root]/sites/development.services.yml": "assets/scaffold/files/development.services.yml",
"[web-root]/sites/example.settings.local.php": "assets/scaffold/files/example.settings.local.php",
- "[web-root]/sites/example.sites.php": "assets/scaffold/files/example.sites.php",
"[web-root]/sites/default/default.services.yml": "assets/scaffold/files/default.services.yml",
- "[web-root]/sites/default/default.settings.php": "assets/scaffold/files/default.settings.php",
- "[web-root]/modules/README.txt": "assets/scaffold/files/modules.README.txt",
- "[web-root]/profiles/README.txt": "assets/scaffold/files/profiles.README.txt",
- "[web-root]/themes/README.txt": "assets/scaffold/files/themes.README.txt"
+ "[web-root]/sites/default/default.settings.php": "assets/scaffold/files/default.settings.php"
}
}
},
@@ -2808,17 +2808,17 @@
},
{
"name": "drupal/easy_breadcrumb",
- "version": "2.0.8",
+ "version": "2.0.9",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/easy_breadcrumb.git",
- "reference": "2.0.8"
+ "reference": "2.0.9"
},
"dist": {
"type": "zip",
- "url": "https://ftp.drupal.org/files/projects/easy_breadcrumb-2.0.8.zip",
- "reference": "2.0.8",
- "shasum": "49bfd9b8b0ec664963d05e360449876745cf2868"
+ "url": "https://ftp.drupal.org/files/projects/easy_breadcrumb-2.0.9.zip",
+ "reference": "2.0.9",
+ "shasum": "9e7c33e2ec0637d37d509776795a476f2f2d9bb8"
},
"require": {
"drupal/core": "^9.2 || ^10 || ^11"
@@ -2826,8 +2826,8 @@
"type": "drupal-module",
"extra": {
"drupal": {
- "version": "2.0.8",
- "datestamp": "1723545040",
+ "version": "2.0.9",
+ "datestamp": "1732752214",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
@@ -3342,17 +3342,17 @@
},
{
"name": "drupal/entity_usage",
- "version": "2.0.0-beta14",
+ "version": "2.0.0-beta15",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/entity_usage.git",
- "reference": "8.x-2.0-beta14"
+ "reference": "8.x-2.0-beta15"
},
"dist": {
"type": "zip",
- "url": "https://ftp.drupal.org/files/projects/entity_usage-8.x-2.0-beta14.zip",
- "reference": "8.x-2.0-beta14",
- "shasum": "68124ea440273a8f4e40bc7d07421c8a230c287b"
+ "url": "https://ftp.drupal.org/files/projects/entity_usage-8.x-2.0-beta15.zip",
+ "reference": "8.x-2.0-beta15",
+ "shasum": "80ad5d27e2a499fae60d303d8cc7daededc6d8a6"
},
"require": {
"drupal/core": "^10.2 || ^11"
@@ -3365,15 +3365,15 @@
"drupal/entity_browser_block": "~1.0",
"drupal/entity_embed": "~1.0",
"drupal/entity_reference_revisions": "~1.0",
- "drupal/inline_entity_form": "^1.0@RC",
+ "drupal/inline_entity_form": "^1.0@RC || ^3.0@RC",
"drupal/paragraphs": "~1.0",
"drupal/webform": "^6.0.0-alpha4"
},
"type": "drupal-module",
"extra": {
"drupal": {
- "version": "8.x-2.0-beta14",
- "datestamp": "1724498300",
+ "version": "8.x-2.0-beta15",
+ "datestamp": "1732783084",
"security-coverage": {
"status": "not-covered",
"message": "Beta releases are not covered by Drupal security advisories."
@@ -3536,7 +3536,7 @@
"homepage": "https://www.drupal.org/user/423148"
},
{
- "name": "Hanno",
+ "name": "hanno",
"homepage": "https://www.drupal.org/user/18826"
},
{
@@ -4075,16 +4075,16 @@
},
{
"name": "drupal/hdbt",
- "version": "6.8.10",
+ "version": "6.8.12",
"source": {
"type": "git",
"url": "https://github.com/City-of-Helsinki/drupal-hdbt.git",
- "reference": "2427bb6c2988c157285e685308e16f0c66e8d5e1"
+ "reference": "eb3b0e24a7846928ce01c2faa8da5d00cc73a6ca"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/2427bb6c2988c157285e685308e16f0c66e8d5e1",
- "reference": "2427bb6c2988c157285e685308e16f0c66e8d5e1",
+ "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/eb3b0e24a7846928ce01c2faa8da5d00cc73a6ca",
+ "reference": "eb3b0e24a7846928ce01c2faa8da5d00cc73a6ca",
"shasum": ""
},
"require": {
@@ -4103,10 +4103,10 @@
"Drupal"
],
"support": {
- "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.8.10",
+ "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.8.12",
"issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues"
},
- "time": "2024-11-22T12:52:59+00:00"
+ "time": "2024-11-28T09:01:49+00:00"
},
{
"name": "drupal/hdbt_admin",
@@ -4204,16 +4204,16 @@
},
{
"name": "drupal/helfi_api_base",
- "version": "2.7.17",
+ "version": "2.7.19",
"source": {
"type": "git",
"url": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base.git",
- "reference": "d5d46f30b9ec1ccac5b5bac130097454232e35a8"
+ "reference": "096a75dd49d1ae4db5959980337de4b77d10cce5"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/d5d46f30b9ec1ccac5b5bac130097454232e35a8",
- "reference": "d5d46f30b9ec1ccac5b5bac130097454232e35a8",
+ "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/096a75dd49d1ae4db5959980337de4b77d10cce5",
+ "reference": "096a75dd49d1ae4db5959980337de4b77d10cce5",
"shasum": ""
},
"require": {
@@ -4245,10 +4245,10 @@
],
"description": "Helfi - API Base",
"support": {
- "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.7.17",
+ "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.7.19",
"issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/issues"
},
- "time": "2024-11-22T08:27:20+00:00"
+ "time": "2024-11-29T09:44:21+00:00"
},
{
"name": "drupal/helfi_azure_fs",
@@ -4420,16 +4420,16 @@
},
{
"name": "drupal/helfi_platform_config",
- "version": "4.8.3",
+ "version": "4.8.6",
"source": {
"type": "git",
"url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git",
- "reference": "e6cde28156dbb1bb890b41e8a5c84d61f9102242"
+ "reference": "6d08f98fbb9980d73ddb8efa5f2d14ceb17f7f44"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/e6cde28156dbb1bb890b41e8a5c84d61f9102242",
- "reference": "e6cde28156dbb1bb890b41e8a5c84d61f9102242",
+ "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/6d08f98fbb9980d73ddb8efa5f2d14ceb17f7f44",
+ "reference": "6d08f98fbb9980d73ddb8efa5f2d14ceb17f7f44",
"shasum": ""
},
"require": {
@@ -4555,10 +4555,10 @@
],
"description": "HELfi platform config",
"support": {
- "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.8.3",
+ "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.8.6",
"issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues"
},
- "time": "2024-11-26T12:32:51+00:00"
+ "time": "2024-11-29T10:12:26+00:00"
},
{
"name": "drupal/helfi_proxy",
@@ -4607,16 +4607,16 @@
},
{
"name": "drupal/helfi_tpr",
- "version": "2.3.9",
+ "version": "2.3.10",
"source": {
"type": "git",
"url": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr.git",
- "reference": "6cca3df5dc891c98ae40e8259856a343d9abd8ca"
+ "reference": "d98687373b1cb4647ad576403e470f049c7a4d3c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tpr/zipball/6cca3df5dc891c98ae40e8259856a343d9abd8ca",
- "reference": "6cca3df5dc891c98ae40e8259856a343d9abd8ca",
+ "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tpr/zipball/d98687373b1cb4647ad576403e470f049c7a4d3c",
+ "reference": "d98687373b1cb4647ad576403e470f049c7a4d3c",
"shasum": ""
},
"require": {
@@ -4642,10 +4642,10 @@
],
"description": "TPR integration",
"support": {
- "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr/tree/2.3.9",
+ "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr/tree/2.3.10",
"issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr/issues"
},
- "time": "2024-11-07T13:09:51+00:00"
+ "time": "2024-11-29T09:43:38+00:00"
},
{
"name": "drupal/helfi_tunnistamo",
@@ -6415,17 +6415,17 @@
},
{
"name": "drupal/search_api",
- "version": "1.36.0",
+ "version": "1.37.0",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/search_api.git",
- "reference": "8.x-1.36"
+ "reference": "8.x-1.37"
},
"dist": {
"type": "zip",
- "url": "https://ftp.drupal.org/files/projects/search_api-8.x-1.36.zip",
- "reference": "8.x-1.36",
- "shasum": "1464f21cb924746a0df7f4cb080abaf00804e9a7"
+ "url": "https://ftp.drupal.org/files/projects/search_api-8.x-1.37.zip",
+ "reference": "8.x-1.37",
+ "shasum": "76d9b5850d7fce9df8fc6cf8c49450ab541f455d"
},
"require": {
"drupal/core": "^10.2 || ^11"
@@ -6446,8 +6446,8 @@
"type": "drupal-module",
"extra": {
"drupal": {
- "version": "8.x-1.36",
- "datestamp": "1732448767",
+ "version": "8.x-1.37",
+ "datestamp": "1732727356",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
@@ -10928,16 +10928,16 @@
},
{
"name": "psy/psysh",
- "version": "v0.12.4",
+ "version": "v0.12.5",
"source": {
"type": "git",
"url": "https://github.com/bobthecow/psysh.git",
- "reference": "2fd717afa05341b4f8152547f142cd2f130f6818"
+ "reference": "36a03ff27986682c22985e56aabaf840dd173cb5"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/bobthecow/psysh/zipball/2fd717afa05341b4f8152547f142cd2f130f6818",
- "reference": "2fd717afa05341b4f8152547f142cd2f130f6818",
+ "url": "https://api.github.com/repos/bobthecow/psysh/zipball/36a03ff27986682c22985e56aabaf840dd173cb5",
+ "reference": "36a03ff27986682c22985e56aabaf840dd173cb5",
"shasum": ""
},
"require": {
@@ -10964,12 +10964,12 @@
],
"type": "library",
"extra": {
- "branch-alias": {
- "dev-main": "0.12.x-dev"
- },
"bamarni-bin": {
"bin-links": false,
"forward-command": false
+ },
+ "branch-alias": {
+ "dev-main": "0.12.x-dev"
}
},
"autoload": {
@@ -11001,9 +11001,9 @@
],
"support": {
"issues": "https://github.com/bobthecow/psysh/issues",
- "source": "https://github.com/bobthecow/psysh/tree/v0.12.4"
+ "source": "https://github.com/bobthecow/psysh/tree/v0.12.5"
},
- "time": "2024-06-10T01:18:23+00:00"
+ "time": "2024-11-29T06:14:30+00:00"
},
{
"name": "ralouphie/getallheaders",
@@ -11051,23 +11051,23 @@
},
{
"name": "ruflin/elastica",
- "version": "8.0.0",
+ "version": "8.1.0",
"source": {
"type": "git",
"url": "https://github.com/ruflin/Elastica.git",
- "reference": "2fc446e37847e84cd9f9be8e75fd2b322007ea43"
+ "reference": "5e5f9b220e34fdcc1a55b9153323e2548f9a51f1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/ruflin/Elastica/zipball/2fc446e37847e84cd9f9be8e75fd2b322007ea43",
- "reference": "2fc446e37847e84cd9f9be8e75fd2b322007ea43",
+ "url": "https://api.github.com/repos/ruflin/Elastica/zipball/5e5f9b220e34fdcc1a55b9153323e2548f9a51f1",
+ "reference": "5e5f9b220e34fdcc1a55b9153323e2548f9a51f1",
"shasum": ""
},
"require": {
"elastic/transport": "^8.8",
"elasticsearch/elasticsearch": "^8.4.1",
"ext-json": "*",
- "php": "~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0",
+ "php": "~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
"psr/log": "^1.0 || ^2.0 || ^3.0"
},
"conflict": {
@@ -11108,9 +11108,9 @@
],
"support": {
"issues": "https://github.com/ruflin/Elastica/issues",
- "source": "https://github.com/ruflin/Elastica/tree/8.0.0"
+ "source": "https://github.com/ruflin/Elastica/tree/8.1.0"
},
- "time": "2024-05-29T11:45:23+00:00"
+ "time": "2024-11-29T07:37:01+00:00"
},
{
"name": "sebastian/diff",
@@ -11436,16 +11436,16 @@
},
{
"name": "symfony/dependency-injection",
- "version": "v6.4.15",
+ "version": "v6.4.16",
"source": {
"type": "git",
"url": "https://github.com/symfony/dependency-injection.git",
- "reference": "70ab1f65a4516ef741e519ea938e6aa465e6aa36"
+ "reference": "7a379d8871f6a36f01559c14e11141cc02eb8dc8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/70ab1f65a4516ef741e519ea938e6aa465e6aa36",
- "reference": "70ab1f65a4516ef741e519ea938e6aa465e6aa36",
+ "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/7a379d8871f6a36f01559c14e11141cc02eb8dc8",
+ "reference": "7a379d8871f6a36f01559c14e11141cc02eb8dc8",
"shasum": ""
},
"require": {
@@ -11497,7 +11497,7 @@
"description": "Allows you to standardize and centralize the way objects are constructed in your application",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/dependency-injection/tree/v6.4.15"
+ "source": "https://github.com/symfony/dependency-injection/tree/v6.4.16"
},
"funding": [
{
@@ -11513,20 +11513,20 @@
"type": "tidelift"
}
],
- "time": "2024-11-09T06:56:25+00:00"
+ "time": "2024-11-25T14:52:46+00:00"
},
{
"name": "symfony/deprecation-contracts",
- "version": "v3.5.0",
+ "version": "v3.5.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/deprecation-contracts.git",
- "reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1"
+ "reference": "74c71c939a79f7d5bf3c1ce9f5ea37ba0114c6f6"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1",
- "reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1",
+ "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/74c71c939a79f7d5bf3c1ce9f5ea37ba0114c6f6",
+ "reference": "74c71c939a79f7d5bf3c1ce9f5ea37ba0114c6f6",
"shasum": ""
},
"require": {
@@ -11564,7 +11564,7 @@
"description": "A generic function and convention to trigger deprecation notices",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/deprecation-contracts/tree/v3.5.0"
+ "source": "https://github.com/symfony/deprecation-contracts/tree/v3.5.1"
},
"funding": [
{
@@ -11580,7 +11580,7 @@
"type": "tidelift"
}
],
- "time": "2024-04-18T09:32:20+00:00"
+ "time": "2024-09-25T14:20:29+00:00"
},
{
"name": "symfony/error-handler",
@@ -11739,16 +11739,16 @@
},
{
"name": "symfony/event-dispatcher-contracts",
- "version": "v3.5.0",
+ "version": "v3.5.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher-contracts.git",
- "reference": "8f93aec25d41b72493c6ddff14e916177c9efc50"
+ "reference": "7642f5e970b672283b7823222ae8ef8bbc160b9f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/8f93aec25d41b72493c6ddff14e916177c9efc50",
- "reference": "8f93aec25d41b72493c6ddff14e916177c9efc50",
+ "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/7642f5e970b672283b7823222ae8ef8bbc160b9f",
+ "reference": "7642f5e970b672283b7823222ae8ef8bbc160b9f",
"shasum": ""
},
"require": {
@@ -11795,7 +11795,7 @@
"standards"
],
"support": {
- "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.5.0"
+ "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.5.1"
},
"funding": [
{
@@ -11811,7 +11811,7 @@
"type": "tidelift"
}
],
- "time": "2024-04-18T09:32:20+00:00"
+ "time": "2024-09-25T14:20:29+00:00"
},
{
"name": "symfony/filesystem",
@@ -11945,16 +11945,16 @@
},
{
"name": "symfony/http-foundation",
- "version": "v6.4.15",
+ "version": "v6.4.16",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-foundation.git",
- "reference": "9b3165eb2f04aeaa1a5a2cfef73e63fe3b22dff6"
+ "reference": "431771b7a6f662f1575b3cfc8fd7617aa9864d57"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/http-foundation/zipball/9b3165eb2f04aeaa1a5a2cfef73e63fe3b22dff6",
- "reference": "9b3165eb2f04aeaa1a5a2cfef73e63fe3b22dff6",
+ "url": "https://api.github.com/repos/symfony/http-foundation/zipball/431771b7a6f662f1575b3cfc8fd7617aa9864d57",
+ "reference": "431771b7a6f662f1575b3cfc8fd7617aa9864d57",
"shasum": ""
},
"require": {
@@ -12002,7 +12002,7 @@
"description": "Defines an object-oriented layer for the HTTP specification",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/http-foundation/tree/v6.4.15"
+ "source": "https://github.com/symfony/http-foundation/tree/v6.4.16"
},
"funding": [
{
@@ -12018,20 +12018,20 @@
"type": "tidelift"
}
],
- "time": "2024-11-08T16:09:24+00:00"
+ "time": "2024-11-13T18:58:10+00:00"
},
{
"name": "symfony/http-kernel",
- "version": "v6.4.15",
+ "version": "v6.4.16",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-kernel.git",
- "reference": "b002a5b3947653c5aee3adac2a024ea615fd3ff5"
+ "reference": "8838b5b21d807923b893ccbfc2cbeda0f1bc00f0"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/http-kernel/zipball/b002a5b3947653c5aee3adac2a024ea615fd3ff5",
- "reference": "b002a5b3947653c5aee3adac2a024ea615fd3ff5",
+ "url": "https://api.github.com/repos/symfony/http-kernel/zipball/8838b5b21d807923b893ccbfc2cbeda0f1bc00f0",
+ "reference": "8838b5b21d807923b893ccbfc2cbeda0f1bc00f0",
"shasum": ""
},
"require": {
@@ -12116,7 +12116,7 @@
"description": "Provides a structured process for converting a Request into a Response",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/http-kernel/tree/v6.4.15"
+ "source": "https://github.com/symfony/http-kernel/tree/v6.4.16"
},
"funding": [
{
@@ -12132,7 +12132,7 @@
"type": "tidelift"
}
],
- "time": "2024-11-13T13:57:37+00:00"
+ "time": "2024-11-27T12:49:36+00:00"
},
{
"name": "symfony/mailer",
@@ -12301,16 +12301,16 @@
},
{
"name": "symfony/options-resolver",
- "version": "v7.1.6",
+ "version": "v7.2.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/options-resolver.git",
- "reference": "85e95eeede2d41cd146146e98c9c81d9214cae85"
+ "reference": "7da8fbac9dcfef75ffc212235d76b2754ce0cf50"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/options-resolver/zipball/85e95eeede2d41cd146146e98c9c81d9214cae85",
- "reference": "85e95eeede2d41cd146146e98c9c81d9214cae85",
+ "url": "https://api.github.com/repos/symfony/options-resolver/zipball/7da8fbac9dcfef75ffc212235d76b2754ce0cf50",
+ "reference": "7da8fbac9dcfef75ffc212235d76b2754ce0cf50",
"shasum": ""
},
"require": {
@@ -12348,7 +12348,7 @@
"options"
],
"support": {
- "source": "https://github.com/symfony/options-resolver/tree/v7.1.6"
+ "source": "https://github.com/symfony/options-resolver/tree/v7.2.0"
},
"funding": [
{
@@ -12364,7 +12364,7 @@
"type": "tidelift"
}
],
- "time": "2024-09-25T14:20:29+00:00"
+ "time": "2024-11-20T11:17:29+00:00"
},
{
"name": "symfony/polyfill-ctype",
@@ -13369,16 +13369,16 @@
},
{
"name": "symfony/routing",
- "version": "v6.4.13",
+ "version": "v6.4.16",
"source": {
"type": "git",
"url": "https://github.com/symfony/routing.git",
- "reference": "640a74250d13f9c30d5ca045b6aaaabcc8215278"
+ "reference": "91e02e606b4b705c2f4fb42f7e7708b7923a3220"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/routing/zipball/640a74250d13f9c30d5ca045b6aaaabcc8215278",
- "reference": "640a74250d13f9c30d5ca045b6aaaabcc8215278",
+ "url": "https://api.github.com/repos/symfony/routing/zipball/91e02e606b4b705c2f4fb42f7e7708b7923a3220",
+ "reference": "91e02e606b4b705c2f4fb42f7e7708b7923a3220",
"shasum": ""
},
"require": {
@@ -13432,7 +13432,7 @@
"url"
],
"support": {
- "source": "https://github.com/symfony/routing/tree/v6.4.13"
+ "source": "https://github.com/symfony/routing/tree/v6.4.16"
},
"funding": [
{
@@ -13448,7 +13448,7 @@
"type": "tidelift"
}
],
- "time": "2024-10-01T08:30:56+00:00"
+ "time": "2024-11-13T15:31:34+00:00"
},
{
"name": "symfony/serializer",
@@ -13550,16 +13550,16 @@
},
{
"name": "symfony/service-contracts",
- "version": "v3.5.0",
+ "version": "v3.5.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/service-contracts.git",
- "reference": "bd1d9e59a81d8fa4acdcea3f617c581f7475a80f"
+ "reference": "e53260aabf78fb3d63f8d79d69ece59f80d5eda0"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/service-contracts/zipball/bd1d9e59a81d8fa4acdcea3f617c581f7475a80f",
- "reference": "bd1d9e59a81d8fa4acdcea3f617c581f7475a80f",
+ "url": "https://api.github.com/repos/symfony/service-contracts/zipball/e53260aabf78fb3d63f8d79d69ece59f80d5eda0",
+ "reference": "e53260aabf78fb3d63f8d79d69ece59f80d5eda0",
"shasum": ""
},
"require": {
@@ -13613,7 +13613,7 @@
"standards"
],
"support": {
- "source": "https://github.com/symfony/service-contracts/tree/v3.5.0"
+ "source": "https://github.com/symfony/service-contracts/tree/v3.5.1"
},
"funding": [
{
@@ -13629,7 +13629,7 @@
"type": "tidelift"
}
],
- "time": "2024-04-18T09:32:20+00:00"
+ "time": "2024-09-25T14:20:29+00:00"
},
{
"name": "symfony/string",
@@ -13719,16 +13719,16 @@
},
{
"name": "symfony/translation-contracts",
- "version": "v3.5.0",
+ "version": "v3.5.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/translation-contracts.git",
- "reference": "b9d2189887bb6b2e0367a9fc7136c5239ab9b05a"
+ "reference": "4667ff3bd513750603a09c8dedbea942487fb07c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/b9d2189887bb6b2e0367a9fc7136c5239ab9b05a",
- "reference": "b9d2189887bb6b2e0367a9fc7136c5239ab9b05a",
+ "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/4667ff3bd513750603a09c8dedbea942487fb07c",
+ "reference": "4667ff3bd513750603a09c8dedbea942487fb07c",
"shasum": ""
},
"require": {
@@ -13777,7 +13777,7 @@
"standards"
],
"support": {
- "source": "https://github.com/symfony/translation-contracts/tree/v3.5.0"
+ "source": "https://github.com/symfony/translation-contracts/tree/v3.5.1"
},
"funding": [
{
@@ -13793,20 +13793,20 @@
"type": "tidelift"
}
],
- "time": "2024-04-18T09:32:20+00:00"
+ "time": "2024-09-25T14:20:29+00:00"
},
{
"name": "symfony/validator",
- "version": "v6.4.15",
+ "version": "v6.4.16",
"source": {
"type": "git",
"url": "https://github.com/symfony/validator.git",
- "reference": "7541055cdaf54ff95f0735bf703d313374e8b20b"
+ "reference": "9b0d1988b56511706bc91d96ead39acd77aaf34d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/validator/zipball/7541055cdaf54ff95f0735bf703d313374e8b20b",
- "reference": "7541055cdaf54ff95f0735bf703d313374e8b20b",
+ "url": "https://api.github.com/repos/symfony/validator/zipball/9b0d1988b56511706bc91d96ead39acd77aaf34d",
+ "reference": "9b0d1988b56511706bc91d96ead39acd77aaf34d",
"shasum": ""
},
"require": {
@@ -13874,7 +13874,7 @@
"description": "Provides tools to validate values",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/validator/tree/v6.4.15"
+ "source": "https://github.com/symfony/validator/tree/v6.4.16"
},
"funding": [
{
@@ -13890,7 +13890,7 @@
"type": "tidelift"
}
],
- "time": "2024-11-08T15:28:48+00:00"
+ "time": "2024-11-27T09:48:51+00:00"
},
{
"name": "symfony/var-dumper",
@@ -13979,16 +13979,16 @@
},
{
"name": "symfony/var-exporter",
- "version": "v7.1.6",
+ "version": "v7.2.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/var-exporter.git",
- "reference": "90173ef89c40e7c8c616653241048705f84130ef"
+ "reference": "1a6a89f95a46af0f142874c9d650a6358d13070d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/var-exporter/zipball/90173ef89c40e7c8c616653241048705f84130ef",
- "reference": "90173ef89c40e7c8c616653241048705f84130ef",
+ "url": "https://api.github.com/repos/symfony/var-exporter/zipball/1a6a89f95a46af0f142874c9d650a6358d13070d",
+ "reference": "1a6a89f95a46af0f142874c9d650a6358d13070d",
"shasum": ""
},
"require": {
@@ -14035,7 +14035,7 @@
"serialize"
],
"support": {
- "source": "https://github.com/symfony/var-exporter/tree/v7.1.6"
+ "source": "https://github.com/symfony/var-exporter/tree/v7.2.0"
},
"funding": [
{
@@ -14051,7 +14051,7 @@
"type": "tidelift"
}
],
- "time": "2024-09-25T14:20:29+00:00"
+ "time": "2024-10-18T07:58:17+00:00"
},
{
"name": "symfony/yaml",
@@ -14226,16 +14226,16 @@
},
{
"name": "twig/twig",
- "version": "v3.15.0",
+ "version": "v3.16.0",
"source": {
"type": "git",
"url": "https://github.com/twigphp/Twig.git",
- "reference": "2d5b3964cc21d0188633d7ddce732dc8e874db02"
+ "reference": "475ad2dc97d65d8631393e721e7e44fb544f0561"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/twigphp/Twig/zipball/2d5b3964cc21d0188633d7ddce732dc8e874db02",
- "reference": "2d5b3964cc21d0188633d7ddce732dc8e874db02",
+ "url": "https://api.github.com/repos/twigphp/Twig/zipball/475ad2dc97d65d8631393e721e7e44fb544f0561",
+ "reference": "475ad2dc97d65d8631393e721e7e44fb544f0561",
"shasum": ""
},
"require": {
@@ -14246,6 +14246,7 @@
"symfony/polyfill-php81": "^1.29"
},
"require-dev": {
+ "phpstan/phpstan": "^2.0",
"psr/container": "^1.0|^2.0",
"symfony/phpunit-bridge": "^5.4.9|^6.4|^7.0"
},
@@ -14289,7 +14290,7 @@
],
"support": {
"issues": "https://github.com/twigphp/Twig/issues",
- "source": "https://github.com/twigphp/Twig/tree/v3.15.0"
+ "source": "https://github.com/twigphp/Twig/tree/v3.16.0"
},
"funding": [
{
@@ -14301,7 +14302,7 @@
"type": "tidelift"
}
],
- "time": "2024-11-17T15:59:19+00:00"
+ "time": "2024-11-29T08:27:05+00:00"
},
{
"name": "twistor/flysystem-stream-wrapper",
diff --git a/conf/cmi/core.base_field_override.paragraphs_library_item.paragraphs_library_item.paragraphs.yml b/conf/cmi/core.base_field_override.paragraphs_library_item.paragraphs_library_item.paragraphs.yml
index 9884ca4e..5579729d 100644
--- a/conf/cmi/core.base_field_override.paragraphs_library_item.paragraphs_library_item.paragraphs.yml
+++ b/conf/cmi/core.base_field_override.paragraphs_library_item.paragraphs_library_item.paragraphs.yml
@@ -50,6 +50,7 @@ settings:
contact_card_listing: contact_card_listing
content_cards: content_cards
image: image
+ image_gallery: image_gallery
liftup_with_image: liftup_with_image
list_of_links: list_of_links
map: map
@@ -58,7 +59,6 @@ settings:
unit_search: unit_search
service_list: service_list
unit_contact_card: unit_contact_card
- image_gallery: image_gallery
negate: 0
target_bundles_drag_drop:
accordion:
diff --git a/conf/cmi/social_media.settings.yml b/conf/cmi/social_media.settings.yml
index 358c7a76..811775db 100644
--- a/conf/cmi/social_media.settings.yml
+++ b/conf/cmi/social_media.settings.yml
@@ -5,7 +5,7 @@ social_media:
facebook_share:
enable: 1
text: 'Share in Facebook'
- api_url: 'http://www.facebook.com/share.php?u=[current-page:url]&title=[current-page:title]'
+ api_url: 'https://www.facebook.com/share.php?u=[current-page:url]&title=[current-page:title]'
api_event: href
default_img: 0
weight: 1
From a8e9ecb8ba6442fcecf42d4378541fee79bae1df Mon Sep 17 00:00:00 2001
From: Santeri Hurnanen
Date: Fri, 29 Nov 2024 13:29:17 +0200
Subject: [PATCH 17/23] UHF-10549: Accept self-signed certificates from
elasticsearch
---
public/sites/default/all.settings.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/public/sites/default/all.settings.php b/public/sites/default/all.settings.php
index d638f605..1088e4f1 100644
--- a/public/sites/default/all.settings.php
+++ b/public/sites/default/all.settings.php
@@ -10,7 +10,7 @@
$config['search_api.server.elastic_kymp']['backend_config']['connector_config']['url'] = getenv('ELASTICSEARCH_URL');
if (getenv('ELASTIC_USER') && getenv('ELASTIC_PASSWORD')) {
- $config['search_api.server.elastic_kymp']['backend_config']['connector'] = 'basicauth';
+ $config['search_api.server.elastic_kymp']['backend_config']['connector'] = 'helfi_connector';
$config['search_api.server.elastic_kymp']['backend_config']['connector_config']['username'] = getenv('ELASTIC_USER');
$config['search_api.server.elastic_kymp']['backend_config']['connector_config']['password'] = getenv('ELASTIC_PASSWORD');
}
From 876698991eabdd7ca1900cca13de58f54e76b520 Mon Sep 17 00:00:00 2001
From: Santeri Hurnanen
Date: Mon, 2 Dec 2024 12:00:07 +0200
Subject: [PATCH 18/23] UHF-10549: Rename config
---
conf/cmi/search_api.index.districts.yml | 4 ++--
conf/cmi/search_api.index.districts_for_filters.yml | 4 ++--
conf/cmi/search_api.index.project_phases.yml | 4 ++--
conf/cmi/search_api.index.project_themes.yml | 4 ++--
conf/cmi/search_api.index.project_types.yml | 4 ++--
conf/cmi/search_api.index.projects.yml | 4 ++--
conf/cmi/search_api.index.street_data.yml | 4 ++--
...ver.elastic_kymp.yml => search_api.server.default.yml} | 2 +-
public/sites/default/all.settings.php | 8 ++++----
9 files changed, 19 insertions(+), 19 deletions(-)
rename conf/cmi/{search_api.server.elastic_kymp.yml => search_api.server.default.yml} (95%)
diff --git a/conf/cmi/search_api.index.districts.yml b/conf/cmi/search_api.index.districts.yml
index f85482ed..4f68889e 100644
--- a/conf/cmi/search_api.index.districts.yml
+++ b/conf/cmi/search_api.index.districts.yml
@@ -7,7 +7,7 @@ dependencies:
- field.storage.node.field_district_image
- field.storage.node.field_district_search_metatags
- field.storage.node.field_subdistricts
- - search_api.server.elastic_kymp
+ - search_api.server.default
module:
- helfi_react_search
- media
@@ -174,4 +174,4 @@ options:
cron_limit: 50
index_directly: false
track_changes_in_references: true
-server: elastic_kymp
+server: default
diff --git a/conf/cmi/search_api.index.districts_for_filters.yml b/conf/cmi/search_api.index.districts_for_filters.yml
index 46373707..4e733ef0 100644
--- a/conf/cmi/search_api.index.districts_for_filters.yml
+++ b/conf/cmi/search_api.index.districts_for_filters.yml
@@ -3,7 +3,7 @@ langcode: en
status: true
dependencies:
config:
- - search_api.server.elastic_kymp
+ - search_api.server.default
module:
- helfi_react_search
- node
@@ -60,4 +60,4 @@ options:
cron_limit: 50
index_directly: false
track_changes_in_references: true
-server: elastic_kymp
+server: default
diff --git a/conf/cmi/search_api.index.project_phases.yml b/conf/cmi/search_api.index.project_phases.yml
index 69943d07..86076981 100644
--- a/conf/cmi/search_api.index.project_phases.yml
+++ b/conf/cmi/search_api.index.project_phases.yml
@@ -3,7 +3,7 @@ langcode: en
status: true
dependencies:
config:
- - search_api.server.elastic_kymp
+ - search_api.server.default
module:
- helfi_react_search
- taxonomy
@@ -62,4 +62,4 @@ options:
cron_limit: 50
index_directly: false
track_changes_in_references: true
-server: elastic_kymp
+server: default
diff --git a/conf/cmi/search_api.index.project_themes.yml b/conf/cmi/search_api.index.project_themes.yml
index f881db60..84c0feba 100644
--- a/conf/cmi/search_api.index.project_themes.yml
+++ b/conf/cmi/search_api.index.project_themes.yml
@@ -3,7 +3,7 @@ langcode: en
status: true
dependencies:
config:
- - search_api.server.elastic_kymp
+ - search_api.server.default
module:
- helfi_react_search
- taxonomy
@@ -60,4 +60,4 @@ options:
cron_limit: 50
index_directly: false
track_changes_in_references: true
-server: elastic_kymp
+server: default
diff --git a/conf/cmi/search_api.index.project_types.yml b/conf/cmi/search_api.index.project_types.yml
index 6a06ccd7..07fd424e 100644
--- a/conf/cmi/search_api.index.project_types.yml
+++ b/conf/cmi/search_api.index.project_types.yml
@@ -3,7 +3,7 @@ langcode: en
status: true
dependencies:
config:
- - search_api.server.elastic_kymp
+ - search_api.server.default
module:
- helfi_react_search
- taxonomy
@@ -60,4 +60,4 @@ options:
cron_limit: 50
index_directly: false
track_changes_in_references: true
-server: elastic_kymp
+server: default
diff --git a/conf/cmi/search_api.index.projects.yml b/conf/cmi/search_api.index.projects.yml
index 09ed78a8..b11b6082 100644
--- a/conf/cmi/search_api.index.projects.yml
+++ b/conf/cmi/search_api.index.projects.yml
@@ -11,7 +11,7 @@ dependencies:
- field.storage.node.field_project_search_metatags
- field.storage.node.field_project_theme
- field.storage.node.field_project_type
- - search_api.server.elastic_kymp
+ - search_api.server.default
module:
- helfi_react_search
- media
@@ -230,4 +230,4 @@ options:
cron_limit: 50
index_directly: false
track_changes_in_references: true
-server: elastic_kymp
+server: default
diff --git a/conf/cmi/search_api.index.street_data.yml b/conf/cmi/search_api.index.street_data.yml
index 00f7a31e..9dce89f6 100644
--- a/conf/cmi/search_api.index.street_data.yml
+++ b/conf/cmi/search_api.index.street_data.yml
@@ -3,7 +3,7 @@ langcode: en
status: true
dependencies:
config:
- - search_api.server.elastic_kymp
+ - search_api.server.default
module:
- helfi_kymp_content
- helfi_react_search
@@ -52,4 +52,4 @@ options:
cron_limit: 50
index_directly: false
track_changes_in_references: true
-server: elastic_kymp
+server: default
diff --git a/conf/cmi/search_api.server.elastic_kymp.yml b/conf/cmi/search_api.server.default.yml
similarity index 95%
rename from conf/cmi/search_api.server.elastic_kymp.yml
rename to conf/cmi/search_api.server.default.yml
index 160fa6f6..d17fc5cc 100644
--- a/conf/cmi/search_api.server.elastic_kymp.yml
+++ b/conf/cmi/search_api.server.default.yml
@@ -4,7 +4,7 @@ status: true
dependencies:
module:
- elasticsearch_connector
-id: elastic_kymp
+id: default
name: 'Elastic KYMP'
description: ''
backend: elasticsearch
diff --git a/public/sites/default/all.settings.php b/public/sites/default/all.settings.php
index 1088e4f1..66c90a0d 100644
--- a/public/sites/default/all.settings.php
+++ b/public/sites/default/all.settings.php
@@ -7,12 +7,12 @@
// Elasticsearch settings.
if (getenv('ELASTICSEARCH_URL')) {
- $config['search_api.server.elastic_kymp']['backend_config']['connector_config']['url'] = getenv('ELASTICSEARCH_URL');
+ $config['search_api.server.default']['backend_config']['connector_config']['url'] = getenv('ELASTICSEARCH_URL');
if (getenv('ELASTIC_USER') && getenv('ELASTIC_PASSWORD')) {
- $config['search_api.server.elastic_kymp']['backend_config']['connector'] = 'helfi_connector';
- $config['search_api.server.elastic_kymp']['backend_config']['connector_config']['username'] = getenv('ELASTIC_USER');
- $config['search_api.server.elastic_kymp']['backend_config']['connector_config']['password'] = getenv('ELASTIC_PASSWORD');
+ $config['search_api.server.default']['backend_config']['connector'] = 'helfi_connector';
+ $config['search_api.server.default']['backend_config']['connector_config']['username'] = getenv('ELASTIC_USER');
+ $config['search_api.server.default']['backend_config']['connector_config']['password'] = getenv('ELASTIC_PASSWORD');
}
}
// Elastic proxy URL.
From e2a3ca637421afcce9aef2855e4453ecebcf625f Mon Sep 17 00:00:00 2001
From: Santeri Hurnanen
Date: Mon, 2 Dec 2024 12:23:10 +0200
Subject: [PATCH 19/23] UHF-10549: Move elasticsearch settings to settings.php
---
public/sites/default/all.settings.php | 10 ----------
1 file changed, 10 deletions(-)
diff --git a/public/sites/default/all.settings.php b/public/sites/default/all.settings.php
index 66c90a0d..c42a35ee 100644
--- a/public/sites/default/all.settings.php
+++ b/public/sites/default/all.settings.php
@@ -5,16 +5,6 @@
* Contains site specific overrides.
*/
-// Elasticsearch settings.
-if (getenv('ELASTICSEARCH_URL')) {
- $config['search_api.server.default']['backend_config']['connector_config']['url'] = getenv('ELASTICSEARCH_URL');
-
- if (getenv('ELASTIC_USER') && getenv('ELASTIC_PASSWORD')) {
- $config['search_api.server.default']['backend_config']['connector'] = 'helfi_connector';
- $config['search_api.server.default']['backend_config']['connector_config']['username'] = getenv('ELASTIC_USER');
- $config['search_api.server.default']['backend_config']['connector_config']['password'] = getenv('ELASTIC_PASSWORD');
- }
-}
// Elastic proxy URL.
$config['elastic_proxy.settings']['elastic_proxy_url'] = getenv('ELASTIC_PROXY_URL');
// Sentry DSN for React.
From d5487cdb44960272f74f0ac267d0d70d79f57c9b Mon Sep 17 00:00:00 2001
From: tuutti
Date: Tue, 3 Dec 2024 08:33:12 +0200
Subject: [PATCH 20/23] UHF-9452: Disable AMQ until prod setup is done
---
public/sites/default/all.settings.php | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/public/sites/default/all.settings.php b/public/sites/default/all.settings.php
index d638f605..589a3058 100644
--- a/public/sites/default/all.settings.php
+++ b/public/sites/default/all.settings.php
@@ -65,9 +65,9 @@
'ELASTIC_USER',
'ELASTIC_PASSWORD',
'SENTRY_DSN_REACT',
- 'AMQ_BROKERS',
- 'AMQ_USER',
- 'AMQ_PASSWORD',
+ // 'AMQ_BROKERS',
+ // 'AMQ_USER',
+ // 'AMQ_PASSWORD',
];
foreach ($additionalEnvVars as $var) {
$preflight_checks['environmentVariables'][] = $var;
From cb0f7a481b11ec4eac9593e25158a9e0a3288bef Mon Sep 17 00:00:00 2001
From: hel-platta-automation
<95360595+hel-platta-automation@users.noreply.github.com>
Date: Tue, 3 Dec 2024 08:14:54 +0000
Subject: [PATCH 21/23] Update configuration
---
.platform/schema | 2 +-
composer.json | 1 +
composer.lock | 123 ++++++++++++------
.../cmi/language/fi/social_media.settings.yml | 2 +-
.../cmi/language/sv/social_media.settings.yml | 2 +-
public/sites/default/settings.php | 32 +++--
6 files changed, 112 insertions(+), 50 deletions(-)
diff --git a/.platform/schema b/.platform/schema
index 9a037142..3cacc0b9 100644
--- a/.platform/schema
+++ b/.platform/schema
@@ -1 +1 @@
-10
\ No newline at end of file
+12
\ No newline at end of file
diff --git a/composer.json b/composer.json
index 288743b7..40cefb98 100644
--- a/composer.json
+++ b/composer.json
@@ -27,6 +27,7 @@
},
"require-dev": {
"dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
+ "dg/bypass-finals": "^1.5",
"drupal/coder": "^8.3",
"drupal/core-dev": "^10.1",
"jangregor/phpstan-prophecy": "^1.0",
diff --git a/composer.lock b/composer.lock
index 11c1ae09..211cff28 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "ad1c636bf4014b119fe178e50a309210",
+ "content-hash": "a73131990e7cfc2bab6c8aa6b8de437d",
"packages": [
{
"name": "asm89/stack-cors",
@@ -3342,17 +3342,17 @@
},
{
"name": "drupal/entity_usage",
- "version": "2.0.0-beta15",
+ "version": "2.0.0-beta16",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/entity_usage.git",
- "reference": "8.x-2.0-beta15"
+ "reference": "8.x-2.0-beta16"
},
"dist": {
"type": "zip",
- "url": "https://ftp.drupal.org/files/projects/entity_usage-8.x-2.0-beta15.zip",
- "reference": "8.x-2.0-beta15",
- "shasum": "80ad5d27e2a499fae60d303d8cc7daededc6d8a6"
+ "url": "https://ftp.drupal.org/files/projects/entity_usage-8.x-2.0-beta16.zip",
+ "reference": "8.x-2.0-beta16",
+ "shasum": "af6533149a0926d2d539f279e7e08073f8f08c55"
},
"require": {
"drupal/core": "^10.2 || ^11"
@@ -3372,8 +3372,8 @@
"type": "drupal-module",
"extra": {
"drupal": {
- "version": "8.x-2.0-beta15",
- "datestamp": "1732783084",
+ "version": "8.x-2.0-beta16",
+ "datestamp": "1733149424",
"security-coverage": {
"status": "not-covered",
"message": "Beta releases are not covered by Drupal security advisories."
@@ -4075,16 +4075,16 @@
},
{
"name": "drupal/hdbt",
- "version": "6.8.12",
+ "version": "6.8.13",
"source": {
"type": "git",
"url": "https://github.com/City-of-Helsinki/drupal-hdbt.git",
- "reference": "eb3b0e24a7846928ce01c2faa8da5d00cc73a6ca"
+ "reference": "297f267856f3566109e80e1e2bd2377117b53110"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/eb3b0e24a7846928ce01c2faa8da5d00cc73a6ca",
- "reference": "eb3b0e24a7846928ce01c2faa8da5d00cc73a6ca",
+ "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/297f267856f3566109e80e1e2bd2377117b53110",
+ "reference": "297f267856f3566109e80e1e2bd2377117b53110",
"shasum": ""
},
"require": {
@@ -4103,10 +4103,10 @@
"Drupal"
],
"support": {
- "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.8.12",
+ "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.8.13",
"issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues"
},
- "time": "2024-11-28T09:01:49+00:00"
+ "time": "2024-12-02T19:33:15+00:00"
},
{
"name": "drupal/hdbt_admin",
@@ -4302,12 +4302,12 @@
"source": {
"type": "git",
"url": "https://github.com/City-of-Helsinki/drupal-tools.git",
- "reference": "3de6f884ac7de9a43fe242f371dcf9416cac47b2"
+ "reference": "2abe26c3735150f630dd1203c3e60a77173d90fd"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/3de6f884ac7de9a43fe242f371dcf9416cac47b2",
- "reference": "3de6f884ac7de9a43fe242f371dcf9416cac47b2",
+ "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/2abe26c3735150f630dd1203c3e60a77173d90fd",
+ "reference": "2abe26c3735150f630dd1203c3e60a77173d90fd",
"shasum": ""
},
"require": {
@@ -4382,7 +4382,7 @@
"source": "https://github.com/City-of-Helsinki/drupal-tools/tree/main",
"issues": "https://github.com/City-of-Helsinki/drupal-tools/issues"
},
- "time": "2024-11-26T06:52:09+00:00"
+ "time": "2024-12-03T06:30:07+00:00"
},
{
"name": "drupal/helfi_navigation",
@@ -4420,16 +4420,16 @@
},
{
"name": "drupal/helfi_platform_config",
- "version": "4.8.6",
+ "version": "4.8.8",
"source": {
"type": "git",
"url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git",
- "reference": "6d08f98fbb9980d73ddb8efa5f2d14ceb17f7f44"
+ "reference": "162ff8387fe1eec6c01325b66f9efc34929b3252"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/6d08f98fbb9980d73ddb8efa5f2d14ceb17f7f44",
- "reference": "6d08f98fbb9980d73ddb8efa5f2d14ceb17f7f44",
+ "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/162ff8387fe1eec6c01325b66f9efc34929b3252",
+ "reference": "162ff8387fe1eec6c01325b66f9efc34929b3252",
"shasum": ""
},
"require": {
@@ -4555,10 +4555,10 @@
],
"description": "HELfi platform config",
"support": {
- "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.8.6",
+ "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.8.8",
"issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues"
},
- "time": "2024-11-29T10:12:26+00:00"
+ "time": "2024-12-03T08:10:05+00:00"
},
{
"name": "drupal/helfi_proxy",
@@ -12866,12 +12866,12 @@
},
"type": "metapackage",
"extra": {
+ "thanks": {
+ "url": "https://github.com/symfony/polyfill",
+ "name": "symfony/polyfill"
+ },
"branch-alias": {
"dev-main": "1.20-dev"
- },
- "thanks": {
- "name": "symfony/polyfill",
- "url": "https://github.com/symfony/polyfill"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -15404,6 +15404,59 @@
},
"time": "2022-02-04T12:51:07+00:00"
},
+ {
+ "name": "dg/bypass-finals",
+ "version": "v1.8.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/dg/bypass-finals.git",
+ "reference": "86b00f0d900c7e15d3341e687e0df89e8c2d4632"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/dg/bypass-finals/zipball/86b00f0d900c7e15d3341e687e0df89e8c2d4632",
+ "reference": "86b00f0d900c7e15d3341e687e0df89e8c2d4632",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=7.1"
+ },
+ "require-dev": {
+ "nette/tester": "^2.3",
+ "phpstan/phpstan": "^0.12"
+ },
+ "type": "library",
+ "autoload": {
+ "classmap": [
+ "src/"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause",
+ "GPL-2.0-only",
+ "GPL-3.0-only"
+ ],
+ "authors": [
+ {
+ "name": "David Grudl",
+ "homepage": "https://davidgrudl.com"
+ }
+ ],
+ "description": "Removes final keyword from source code on-the-fly and allows mocking of final methods and classes",
+ "keywords": [
+ "finals",
+ "mocking",
+ "phpunit",
+ "testing",
+ "unit"
+ ],
+ "support": {
+ "issues": "https://github.com/dg/bypass-finals/issues",
+ "source": "https://github.com/dg/bypass-finals/tree/v1.8.0"
+ },
+ "time": "2024-07-02T22:24:43+00:00"
+ },
{
"name": "doctrine/instantiator",
"version": "2.0.0",
@@ -16918,16 +16971,16 @@
},
{
"name": "phpstan/phpstan",
- "version": "1.10.58",
+ "version": "1.12.12",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan.git",
- "reference": "a23518379ec4defd9e47cbf81019526861623ec2"
+ "reference": "b5ae1b88f471d3fd4ba1aa0046234b5ca3776dd0"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpstan/phpstan/zipball/a23518379ec4defd9e47cbf81019526861623ec2",
- "reference": "a23518379ec4defd9e47cbf81019526861623ec2",
+ "url": "https://api.github.com/repos/phpstan/phpstan/zipball/b5ae1b88f471d3fd4ba1aa0046234b5ca3776dd0",
+ "reference": "b5ae1b88f471d3fd4ba1aa0046234b5ca3776dd0",
"shasum": ""
},
"require": {
@@ -16970,13 +17023,9 @@
{
"url": "https://github.com/phpstan",
"type": "github"
- },
- {
- "url": "https://tidelift.com/funding/github/packagist/phpstan/phpstan",
- "type": "tidelift"
}
],
- "time": "2024-02-12T20:02:57+00:00"
+ "time": "2024-11-28T22:13:23+00:00"
},
{
"name": "phpstan/phpstan-deprecation-rules",
diff --git a/conf/cmi/language/fi/social_media.settings.yml b/conf/cmi/language/fi/social_media.settings.yml
index 973f8ba0..94e60de6 100644
--- a/conf/cmi/language/fi/social_media.settings.yml
+++ b/conf/cmi/language/fi/social_media.settings.yml
@@ -1,7 +1,7 @@
social_media:
facebook_share:
text: 'Jaa Facebook-palvelussa'
- api_url: 'http://www.facebook.com/share.php?u=[current-page:url]&title=[current-page:title]'
+ api_url: 'https://www.facebook.com/share.php?u=[current-page:url]&title=[current-page:title]'
attributes: "target|_blank\r\nclass|facebook-share"
linkedin:
text: 'Jaa LinkedIn-palvelussa'
diff --git a/conf/cmi/language/sv/social_media.settings.yml b/conf/cmi/language/sv/social_media.settings.yml
index 79ff812c..027c6e2c 100644
--- a/conf/cmi/language/sv/social_media.settings.yml
+++ b/conf/cmi/language/sv/social_media.settings.yml
@@ -1,7 +1,7 @@
social_media:
facebook_share:
text: 'Dela på Facebook'
- api_url: 'http://www.facebook.com/share.php?u=[current-page:url]&title=[current-page:title]'
+ api_url: 'https://www.facebook.com/share.php?u=[current-page:url]&title=[current-page:title]'
attributes: "target|_blank\r\nclass|facebook-share"
linkedin:
text: 'Dela på Linkedin'
diff --git a/public/sites/default/settings.php b/public/sites/default/settings.php
index b80276cd..b68b80aa 100755
--- a/public/sites/default/settings.php
+++ b/public/sites/default/settings.php
@@ -289,7 +289,7 @@ function drupal_get_env(string|array $variables) : mixed {
'helfi_api_base_revision',
];
foreach ($queues as $queue) {
- $settings['queue_service_' . $queue] = 'queue.stomp.default';
+ // $settings['queue_service_' . $queue] = 'queue.stomp.default';
}
// You must configure project specific queues manually in 'all.settings.php'
// file.
@@ -359,6 +359,27 @@ function drupal_get_env(string|array $variables) : mixed {
'additionalFiles' => [],
];
+// Elasticsearch server config.
+if (getenv('ELASTICSEARCH_URL')) {
+ $config['search_api.server.default']['backend_config']['connector_config']['url'] = getenv('ELASTICSEARCH_URL');
+
+ if (getenv('ELASTIC_USER') && getenv('ELASTIC_PASSWORD')) {
+ $config['search_api.server.default']['backend_config']['connector'] = 'helfi_connector';
+ $config['search_api.server.default']['backend_config']['connector_config']['username'] = getenv('ELASTIC_USER');
+ $config['search_api.server.default']['backend_config']['connector_config']['password'] = getenv('ELASTIC_PASSWORD');
+ }
+}
+
+
+// Supported values: https://github.com/Seldaek/monolog/blob/main/doc/01-usage.md#log-levels.
+$default_log_level = getenv('APP_ENV') === 'production' ? 'info' : 'debug';
+$settings['helfi_api_base.log_level'] = getenv('LOG_LEVEL') ?: $default_log_level;
+
+// Turn sentry JS error tracking on if SENTRY_DSN_PUBLIC is defined.
+if (getenv('SENTRY_DSN_PUBLIC')) {
+ $config['raven.settings']['javascript_error_handler'] = TRUE;
+}
+
// Environment specific overrides.
if (file_exists(__DIR__ . '/all.settings.php')) {
// phpcs:ignore
@@ -389,15 +410,6 @@ function drupal_get_env(string|array $variables) : mixed {
}
}
-// Supported values: https://github.com/Seldaek/monolog/blob/main/doc/01-usage.md#log-levels.
-$default_log_level = getenv('APP_ENV') === 'production' ? 'info' : 'debug';
-$settings['helfi_api_base.log_level'] = getenv('LOG_LEVEL') ?: $default_log_level;
-
-// Turn sentry JS error tracking on if SENTRY_DSN_PUBLIC is defined.
-if (getenv('SENTRY_DSN_PUBLIC')) {
- $config['raven.settings']['javascript_error_handler'] = TRUE;
-}
-
/**
* Deployment identifier.
*
From 2191a5f10f45f72d4b4002c73335518e0f02f872 Mon Sep 17 00:00:00 2001
From: hel-platta-automation
<95360595+hel-platta-automation@users.noreply.github.com>
Date: Tue, 3 Dec 2024 08:50:15 +0000
Subject: [PATCH 22/23] Update configuration
---
composer.lock | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/composer.lock b/composer.lock
index 211cff28..5e0f99c1 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4420,16 +4420,16 @@
},
{
"name": "drupal/helfi_platform_config",
- "version": "4.8.8",
+ "version": "4.8.9",
"source": {
"type": "git",
"url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git",
- "reference": "162ff8387fe1eec6c01325b66f9efc34929b3252"
+ "reference": "d36c184befaae3efd8d95e69d1d2dd5df93e6056"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/162ff8387fe1eec6c01325b66f9efc34929b3252",
- "reference": "162ff8387fe1eec6c01325b66f9efc34929b3252",
+ "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/d36c184befaae3efd8d95e69d1d2dd5df93e6056",
+ "reference": "d36c184befaae3efd8d95e69d1d2dd5df93e6056",
"shasum": ""
},
"require": {
@@ -4555,10 +4555,10 @@
],
"description": "HELfi platform config",
"support": {
- "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.8.8",
+ "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.8.9",
"issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues"
},
- "time": "2024-12-03T08:10:05+00:00"
+ "time": "2024-12-03T08:46:03+00:00"
},
{
"name": "drupal/helfi_proxy",
From c0d22e72c33f930be0486cafed5d5c7accc58ee7 Mon Sep 17 00:00:00 2001
From: hel-platta-automation
<95360595+hel-platta-automation@users.noreply.github.com>
Date: Wed, 4 Dec 2024 06:18:48 +0000
Subject: [PATCH 23/23] Update configuration
---
composer.lock | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/composer.lock b/composer.lock
index 5e0f99c1..4131e523 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4075,16 +4075,16 @@
},
{
"name": "drupal/hdbt",
- "version": "6.8.13",
+ "version": "6.8.16",
"source": {
"type": "git",
"url": "https://github.com/City-of-Helsinki/drupal-hdbt.git",
- "reference": "297f267856f3566109e80e1e2bd2377117b53110"
+ "reference": "7078104991314db54aa0301b508dba947f2e4a87"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/297f267856f3566109e80e1e2bd2377117b53110",
- "reference": "297f267856f3566109e80e1e2bd2377117b53110",
+ "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/7078104991314db54aa0301b508dba947f2e4a87",
+ "reference": "7078104991314db54aa0301b508dba947f2e4a87",
"shasum": ""
},
"require": {
@@ -4103,10 +4103,10 @@
"Drupal"
],
"support": {
- "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.8.13",
+ "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.8.16",
"issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues"
},
- "time": "2024-12-02T19:33:15+00:00"
+ "time": "2024-12-04T05:47:34+00:00"
},
{
"name": "drupal/hdbt_admin",
@@ -4420,16 +4420,16 @@
},
{
"name": "drupal/helfi_platform_config",
- "version": "4.8.9",
+ "version": "4.8.10",
"source": {
"type": "git",
"url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git",
- "reference": "d36c184befaae3efd8d95e69d1d2dd5df93e6056"
+ "reference": "2e1c2a4d090084042954e56b0a61e3077d1daf4f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/d36c184befaae3efd8d95e69d1d2dd5df93e6056",
- "reference": "d36c184befaae3efd8d95e69d1d2dd5df93e6056",
+ "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/2e1c2a4d090084042954e56b0a61e3077d1daf4f",
+ "reference": "2e1c2a4d090084042954e56b0a61e3077d1daf4f",
"shasum": ""
},
"require": {
@@ -4555,10 +4555,10 @@
],
"description": "HELfi platform config",
"support": {
- "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.8.9",
+ "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.8.10",
"issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues"
},
- "time": "2024-12-03T08:46:03+00:00"
+ "time": "2024-12-04T06:14:43+00:00"
},
{
"name": "drupal/helfi_proxy",