Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: City-of-Helsinki/hel-fi-drupal-grants
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2024-12-12.1
Choose a base ref
...
head repository: City-of-Helsinki/hel-fi-drupal-grants
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2025-01-15.1
Choose a head ref
  • 1 commit
  • 223 files changed
  • 15 contributors

Commits on Jan 15, 2025

  1. Dev to main (#1599) 

    * UHF-10354: new cron entrypoint (#1506)

* UHF-10354: Remove base.sh

* UHF-10354: Remove migrate-hearings.sh

* UHF-10343: Updating the liikunta_suunnistuskartta_avustus forms texts (#1513)

* UHF-10343: Update liikunta_suunnistuskartta_avustus forms texts to new version

* UHF-10343: Fix issue with application search where the search button and the clear the search button have no spacing in between

* UHF-10343: Fix issue with unneccessary wrapper around the application search form styles

* UHF-10248: Run tests against automatic updates (#1516)

* UHF-10131: sentry (#1515)

* UHF-10131: Repurpose grants_logger module for sentry logging

* UHF-10131: Fix typo

* UHF-10131: Code deduplication

* UHF-10131: Capture exceptions

* UHF-10131: Remove comment

* feat: UHF-XXXX: Fix failing tests by fixing dependency-related errors. (#1517)

* Refactor events to custom module to get installation to succeed
* Make some services use lazyloading with events service.
* Add update hook & make sure drush deploy is run 1st.
* PHPCS
* Try to clear caches after importing DB to no avail.

* fix: Disable pubsub (#1518)

* must be completely commented out (#1519)

* UHF-10276: Replace old dialog.js implementation from forms (#1511)

* UHF-10276: Replace the dialog.js functionality with custom dialog

* UHF-10276: Fix translations, style the close button on the dialog

* UHF-10276: Add focus trap for the dialog

* UHF-10276: Refactor dialog and survey styles together

* UHF-10276: Add comment about survey similarities

* UHF-10276: Refactor dialog to a separate file so it can be used by other grants modules, refactored dialog.js away from grants_profile, add translations and remove old dialog.js

---------

Co-authored-by: Janne Suominen <janne.suominen@siili.com>

* Removed article permissions (#1522)

* Automatic update (#1520)

* Update configuration

* Revert unwanted changes from configuration

* Revert unwanted changes from configuration

* Update .gitignore

* Removed article permissions

---------

Co-authored-by: Tero Elonen <tero.elonen@druid.fi>
Co-authored-by: Janne Suominen <janne.suominen@siili.com>
Co-authored-by: tuutti <tuutti@iki.fi>

* UHF-10276: Fix translations on webform.form.unsaved.js (#1525)

* UHF-10276: Replace the dialog.js functionality with custom dialog

* UHF-10276: Fix translations, style the close button on the dialog

* UHF-10276: Add focus trap for the dialog

* UHF-10276: Refactor dialog and survey styles together

* UHF-10276: Add comment about survey similarities

* UHF-10276: Refactor dialog to a separate file so it can be used by other grants modules, refactored dialog.js away from grants_profile, add translations and remove old dialog.js

* UHF-10276: Manually trigger translations for the webform.form.unsaved javascript file

* UHF-9938: Update pipeline triggers (#1529)

* Update pipeline triggers

* UHF-9938: Update README.md

* Update configuration (#1523) (#1530)

Co-authored-by: hel-platta-automation <95360595+hel-platta-automation@users.noreply.github.com>

* fix: UHF-10656: Add missing translations. Fix incorrect config name for help texts. (#1521)

* UHF-10656: Add translations for issuer_name

* UHF-10656: Fix translations, #text -> #markup

* fix: Remove form tool from composer (#1526)

* Remove form tool from composer
* Update configuration (#1523)

---------

Co-authored-by: hel-platta-automation <95360595+hel-platta-automation@users.noreply.github.com>

* conf: Update configuration (#1532)

* Update configuration (#1534)

* fix: Add suffix for filenames to force unique files. (#1536)

* Update configuration (#1537)

Co-authored-by: khalima <1712902+khalima@users.noreply.github.com>

* Update configuration (#1538)

* UHF-10826 Update ATV-profile after mandate has been requested (#1531)

* UHF-10826: get rid of the unnecessary nesting

* UHF-10826: clean the old style properties

* UHF-10826: both traits are in base class

* UHF-10826: get company data after mandating user and send it to ATV

* UHF-10826: missing comment

* UHF-10826: Add single document query to HTTP

* UHF-10826: Small changes + handle new profile.

---------

Co-authored-by: Janne Suominen <janne.suominen@siili.com>

* Update configuration (#1541)

* UHF-10741: Force user to visit all pages before submitting application (#1533)

* UHF-10741: Force user to visit all pages before submitting application

* UHF-10741: Fix phpcs

* UHF-10741: Fix translations

* fix: UHF-10845: Update applications from profile data (#1540)

* UHF-10845: cleanup
* UHF-10845: comments
* UHF-10845: update the company information after saing
* UHF-10845: correct comment style
* UHF-10845: code fixes
* UHF-10845: added missing parameter types
* UHF-10845: prevent phpstan error by making the class final
* UHF-10845: missing entitytypemanager
* UHF-10845: code fixes
* UHF-10845: fixed docblok
* UHF-10845: Refetch profile after saving it to make sure we use latest data.
* UHF-10845: clarify that this change is on purpose

---------

Co-authored-by: Janne Suominen <janne.suominen@siili.com>

* fix: UHF-10817: Make loading of submissions better. Fix ID63 form same time. Also title loading for new applications. (#1539)

* UHF-10537: Update document dl function
* UHF-10537: Set processed file types to static
* UHF-10537: Load application types via webform.
* UHF-10537: Add new example applications.
* UHF-10537: New configs
* UHF-10537: PHPCS
* UHF-10537: Add check for nonexistent UUID
* Comment out parent_loadData in storage controller
* Comment out parent_loadData in storage controller
* UHF-10877: Add rest queries for testing race condition things. Suggestion for fixing race conditions.
* UHF-10537: Refactor to support webform title usage.
* UHF-10817: PHPCS
* UHF-10817: Refactor ApplicationController.
* UHF-10817: Remove base Exception throwing.
* UHF-10817: A bit more refactoring to remove static methods & calls.
* UHF-10817: Fix copy form button in admin UI.

* feat: Snyk upgrade b785815b434b86e46b4901cb202437dd (#1548)

* Update configuration (#1523)

* fix: upgrade @playwright/test from 1.41.2 to 1.48.0

Snyk has created this PR to upgrade @playwright/test from 1.41.2 to 1.48.0.

See this package in npm:
@playwright/test

See this project in Snyk:
https://app.snyk.io/org/city-of-helsinki/project/aed93529-486e-499e-9b12-5815057dc0ec?utm_source=github&utm_medium=referral&page=upgrade-pr

* Update e2e docker image

---------

Co-authored-by: hel-platta-automation <95360595+hel-platta-automation@users.noreply.github.com>
Co-authored-by: snyk-bot <snyk-bot@snyk.io>

* feat: [Snyk] Upgrade @types/node from 20.11.7 to 20.16.11 (#1545)

* Update configuration (#1523)

* fix: upgrade @types/node from 20.11.7 to 20.16.11

Snyk has created this PR to upgrade @types/node from 20.11.7 to 20.16.11.

See this package in npm:
@types/node

See this project in Snyk:
https://app.snyk.io/org/city-of-helsinki/project/aed93529-486e-499e-9b12-5815057dc0ec?utm_source=github&utm_medium=referral&page=upgrade-pr

---------

Co-authored-by: hel-platta-automation <95360595+hel-platta-automation@users.noreply.github.com>
Co-authored-by: snyk-bot <snyk-bot@snyk.io>

* feat: [Snyk] Upgrade dotenv from 16.4.1 to 16.4.5 (#1546)

* Update configuration (#1523)

* fix: upgrade dotenv from 16.4.1 to 16.4.5

Snyk has created this PR to upgrade dotenv from 16.4.1 to 16.4.5.

See this package in npm:
dotenv

See this project in Snyk:
https://app.snyk.io/org/city-of-helsinki/project/aed93529-486e-499e-9b12-5815057dc0ec?utm_source=github&utm_medium=referral&page=upgrade-pr

---------

Co-authored-by: hel-platta-automation <95360595+hel-platta-automation@users.noreply.github.com>
Co-authored-by: snyk-bot <snyk-bot@snyk.io>

* feat: [Snyk] Upgrade @faker-js/faker from 8.3.1 to 8.4.1 (#1547)

* Update configuration (#1523)

* fix: upgrade @faker-js/faker from 8.3.1 to 8.4.1

Snyk has created this PR to upgrade @faker-js/faker from 8.3.1 to 8.4.1.

See this package in npm:
@faker-js/faker

See this project in Snyk:
https://app.snyk.io/org/city-of-helsinki/project/aed93529-486e-499e-9b12-5815057dc0ec?utm_source=github&utm_medium=referral&page=upgrade-pr

* Update e2e tests

---------

Co-authored-by: hel-platta-automation <95360595+hel-platta-automation@users.noreply.github.com>
Co-authored-by: snyk-bot <snyk-bot@snyk.io>

* Update configuration (#1542)

* Automatic update (#1549)

* Update configuration

* Reverted filter changes.

---------

Co-authored-by: Markus Kalijärvi <markus.kalijarvi@druid.fi>

* Update configuration (#1550)

* fix: UHF-10656: Fix incorrectly copied transaltions (#1552)

* Update configuration (#1551)

* Update configuration (#1554)

* doc: UHF-10807: Add example for new form + update schema (#1555)

* UHF-10807: Add example for new form + update schema

* UHF-10807: Fix formatting for schema file.

* docs: UHF-10806: Example for form ID71 & schema updates (#1557)

* UHF-10806: Example & schema updates

* UHF-10806: Format

* Update configuration (#1556)

* feat: UHF-10556: Update dropdown options for Myönnetyt / Haetut component. (#1558)

* UHF-10556: Add function to override issuer options.

* UHF-10556: Remove STEA from dropdown options.

* UHF-10556: Add tests for new field options + other things.

* UHF-10556: Rollback yleisavustus?

* fix: UHF-10711: New form changes (#1560)

* UHF-10711: remove duplicate title

* UHF-10711: date format from c which is datetime, to Y-m-d

* UHF-10711: added missing 3.5 fields

* UHF-10711: added the mappings

* UHF-10711: langcode fi because we have to

* UHF-10711: sv translation

* UHF-10711: finnish translation

* UHF-10711: rename the form

* UHF-10711: small changes

* UHF-10711: update the configuration with translation

* UHF-10711: remove brs

* UHF-10711: added summa fields

* UHF-10711: remove wrong configuration, added texts / requirements in correct form

* UHF-10711: added tulo and meno sv translation

* UHF-10711: more sv translations

* UHF-10711: more translations including english

* UHF-10711: useless comment

* UHF-10711: tweak translations

* UHF-10711: Fix data type on other hidden field & remove required status from one

* UHF-10711: Add new booleanish to Kyllä/Ei converter and use it for fields.

* UHF-10711: Typo

* UHF-10711: PHPCS

* UHF-10711: Add ensisijainen taiteenala field.

---------

Co-authored-by: Janne Suominen <janne.suominen@siili.com>

* Update configuration (#1562)

* feat: UHF-8678: Use Drupal.cookieConsent functions (#1559)

* UHF-8678: Updated the matomo.js to use Drupal.cookieConsent functions.

* UHF-8678: Added dist.

* fix: UHF-10903: Update application copy modal to use new dialog (#1563)

* UHF-10903: New dialog form

* UHF-10903: Refactor application copy to custom controller.

* UHF-10903: Add custom selector option for dialogs.

* UHF-10903: Update tests for new copy functionality.

* UHF-10903: Rename method + 1 error

* UHF-10903: Fix typo

* UHF-10903: Refactor createDialog to support object argument.

* Uhf x more tranlations (#1569)

* missing tooltip

* more tooltips

* Update configuration (#1565)

* feat: UHF-10728: KUVA ID70 form e2e tests (#1566)

* UHF-10728: Added SLOWMO environment variable to wait 1 second before clicking elements. Works like this: SLOWMO=true npx playwright...

* UHF-10728: Added 'exit on first error' and 'slowmo' instructions.

* UHF-10728: Added the application data for the iakkaiden-kulttuuri-ja-liikunta form.

* UHF-10728: Added the registered_community test for the "iakkaiden-kulttuuri-ja-liikunta" webform.

* UHF-10728: Minor changes to test + one warning removal.

* UHF-10728: PHPCS

---------

Co-authored-by: Janne Suominen <janne.suominen@siili.com>

* Update configuration (#1571)

* Uhf x more tranlations (#1572)

* missing tooltip

* more tooltips

* more translations

* duplicated for some reason

* fix: Remove some remaining STEAs.. (#1573)

* fix: Remove config (#1577)

* Update configuration (#1574)

* UHF-10629: Added rent income composite to webform print controller (#1578)

* fix: UHF-10711: Form & translation fixes (#1580)

* UHF-10711: Form & translation fixes

* UHF-10711: Form title + description

* UHF-10711: Target group fix.

* UHF-10711: Grant type translations.

* UHF-10571: Modify the order where questions are asked in budget_cost_static webform element (#1575)

* feat: UHF-10693: Add copyable list for application delete function + new Event for sending to integration. (#1576)

* Update configuration (#1579)

* UHF-10883 (#1581)

* UHF-10883: Change compensation_explanation

* UHF-10883: Change liikuntatiloista_maksetut_vuokrat_fieldset

* UHF-10883: Change lajijaostot_info

* UHF-10883: Change ClubSectionComposite component

* UHF-10883: Fix club-section styles

* UHF-10883: Change lajijaostot_helsinkilaisille_aktiiviharrastajille

* fix: UHF-10711: Requested changes ID70 form (#1582)

* UHF-10711: Requested changes.

* UHF-10711: Form title + some translations.

* UHF-10711: Form item description styling fixes

* UHF-10711: Last fixes from Janne.

* UHF-10711: REbuilt styles

---------

Co-authored-by: Tero Elonen <tero.elonen@druid.fi>

* UHF-10711: Last(?) fixes.. (#1583)

* Uhf 10711 fixes 3 (#1584)

* UHF-10711: Last(?) fixes..

* UHF-10711: HDBT version

* UHF-10456: Sosiaali-, terveys- ja pelastustoimen yleisavustus (#1567)

* UHF-10456: Add configs

* UHF-10456: Add rest of necessary configs

* UHF-10456: Fix translations

* UHF-10456: Missing title translations

* UHF-10456: Fix mismapping

* UHF-10456: Fix phpcs

* UHF-10952: Allow login with high eIDAS levels of assurance (#1585)

https://ec.europa.eu/digital-building-blocks/sites/display/DIGITAL/eIDAS+Levels+of+Assurance

* fix: UHF-10711: Last fix to form & test update (#1586)

* Update Azure Devops pipelines (#1568)

* build: pipeline templates by Ansible scripts

* Remove obsolete pipeline files

* UHF-10722 (#1587)

* UHF-10722: separate function for rented premise and premise

* UHF-10722: missing help text

* UHF-10722: missing return type

* UHF-10722: phpcs fixes

* UHF-10722: the needed composite class was already made. Revert the change and use the ready made class instead

* UHF-10722: correct comment

* Add missing translations (#1589)

* Set form_submit & form_submit_back values for forms & default values. (#1588)

* UHF-10722: remove the visibility helper text (#1591)

* UHF-10722: remove the visibility helper text

* UHF-10722: remove also the text from part4

* UHF-10722: added comment

* UHF-10456: Compensation purpose fixes (#1592)

* UHF-11044: Update texts (#1593)

* UHF-10903: Fix missing dialog translations. (#1595)

* UHF-11041: Change pipeline triggers (#1594)

* UHF-10711: Fixes per comments (#1598)

* UHF-10345: Uncommentend previously failing tests. (#1596)

* UHF-10455: Add new General grants for welfare and health promotion form (#1597)

* UHF-10149: Add tests for after submit messaging (#1590)

* Add tests for after submit messaging

* Add tests for after submit messaging

* UHF-10149: Add attachment test to messaging

* UHF-10149: Fix variable name

* UHF-10149: Remove one await

---------

Co-authored-by: Janne Suominen <janne.suominen@siili.com>

* Change description class coloring to be grants specific styling (#1600)

* UHF-11076 (#1601)

* UHF-11076: fix encoded ampersands on form fields after loading data from atv

* UHF-11076: fix the encoded ampersand problem on grantpremsesservice. decode also all string string fields as well

* UHF-11076: reorder the first section by weight

* UHF-11076: sort all sections inside a page

* Use trim and rawurlencode to prevent possible infinite loop. (#1602)

* changes for release (#1604)

* UHF-11127: Fix thrown error when user tries to get form with out uuid (#1606)

* UHF-11127: Fix thrown error when user tries to get form with out uuid in metadata.

* UHF-11127: Make sure the form_uuid is always set, even if it's not in the og metadata.

* UHF-10455: Fixes to recently added forms (#1608)

* Fix missing SV translations
* Remove STEA as an option

* was added most likely to fix search_api issue #3195994. Removing the patch since it is fixed (#1610)

Co-authored-by: Risto Nykänen <risto.nykanen@DRUID-M4PHW0KPWN.local>

* Update configuration (#1611)

Co-authored-by: khalima <1712902+khalima@users.noreply.github.com>

* UHF-11076 (#1614)

* UHF-11076.1: prevent encoded characters on filled application preview

* UHF-11076.1: this is not worth an error

* UHF-11137: Run CI pipelines using Docker compose setup (#1613)

* UHF-11137: Run CI pipelines using Docker compose setup

* UHF-11137: Disabled config language check again

* UHF-11137: Bumped php version

* UHF-11137: Fixed phpunit env variables

* UHF-11137: Updated helfi platform tools.

* UHF-11137: Updated platform tools.

---------

Co-authored-by: Markus Kalijärvi <markus.kalijarvi@druid.fi>

* UHF-10935: Added class and margin for delete attachment button (#1615)

* UHF-10935: Added class and margin for delete attachment button

* UHF-10935: Removed nesting

* Automatic update (#1616)

* Update configuration

* Update configuration

* PHPCS + tbachert/spi

---------

Co-authored-by: Janne Suominen <janne.suominen@siili.com>

* Add overwrites (#1617)

* Add overwrites

* Add overwrites 70

* Uhf xx add 68 settings (#1618)

* Add overwrites

* Add overwrites 70

* Fix hyteed

* Uhf xx add 68 settings (#1619)

* Add overwrites

* Add overwrites 70

* Fix hyteed

* Fix sotepeed + import

* Update webform configs in install folder. (#1609)

* Update webform configs in install folder.

* Add READMEs

* UHF-11137: Reusable workflows (#1621)

* UHF-11137: Reusable workflows

* UHF-11137: Fixed check

* UHF-10593: Add 1000 character limit to two fields on two forms (#1622)

* UHF-10593: Add 1000 character limit to forms 47 and 49

* UHF-10593: Add missing translations for the character limit field

* Automatic update (#1620)

* Update configuration

* Updated carbon.

---------

Co-authored-by: Markus Kalijärvi <markus.kalijarvi@druid.fi>

---------

Co-authored-by: Santeri Hurnanen <santeri.hurnanen@fame.fi>
Co-authored-by: Tero Elonen <2276077+teroelonen@users.noreply.github.com>
Co-authored-by: tuutti <tuutti@iki.fi>
Co-authored-by: Janne Suominen <janne.suominen@siili.com>
Co-authored-by: rpnykanen <48206082+rpnykanen@users.noreply.github.com>
Co-authored-by: hel-platta-automation <95360595+hel-platta-automation@users.noreply.github.com>
Co-authored-by: Tero Elonen <tero.elonen@druid.fi>
Co-authored-by: khalima <1712902+khalima@users.noreply.github.com>
Co-authored-by: jeremysteerio <49063836+jeremysteerio@users.noreply.github.com>
Co-authored-by: snyk-bot <snyk-bot@snyk.io>
Co-authored-by: Markus Kalijärvi <markus.kalijarvi@druid.fi>
Co-authored-by: annadruid <161724181+annadruid@users.noreply.github.com>
Co-authored-by: Tero Virtanen <105207219+terovirtanen@users.noreply.github.com>
Co-authored-by: Risto Nykänen <risto.nykanen@DRUID-M4PHW0KPWN.local>
    @github-actions @hyrsky
    @teroelonen @tuutti @jiisuominen @rpnykanen @hel-platta-automation @khalima @jeremysteerio @snyk-bot @annadruid @terovirtanen
    15 people authored Jan 15, 2025

    Verified

    This commit was signed with the committer’s verified signature.
    drashna Drashna Jaelre
    GPG key ID: DBA1FD3A860D1B11
    Verified
    Learn about vigilant mode
    Copy the full SHA
    0346827 View commit details
Loading