From 57648e948c7b0f8765fe0021aec441cc0412cfbb Mon Sep 17 00:00:00 2001 From: Janne Suominen Date: Tue, 8 Oct 2024 11:23:00 +0300 Subject: [PATCH 1/7] Version + changelog --- CHANGELOG.md | 9 +++++++++ composer.json | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c0a8d357a..5a9bb2d90 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,14 @@ # CHANGELOG +## 2024.14 +- 15cac2065 feat: UHF-10630: Update autologout (#1498) +- bcb5965cf fix: UHF-10639: If hometown is not properly set, use - and log errors. (#1494) +- e563549f0 Update configuration (#1497) +- e40c9e132 Hotfix UHF-10750 - 2024.13.1 +- ac7621f99 UHF-10750: Add check for missing label text +- b5538eb75 Update configuration (#1495) + + ## 2024.13 - 9465ef688 Update configuration (#1492) - 9a2032b95 Fix error with missing label. diff --git a/composer.json b/composer.json index 21f4f044e..4054766f3 100644 --- a/composer.json +++ b/composer.json @@ -6,7 +6,7 @@ "homepage": "https://github.com/City-of-Helsinki/drupal-helfi-platform", "minimum-stability": "dev", "prefer-stable": true, - "version": "2024.13", + "version": "2024.14", "require": { "ext-json": "*", "composer/installers": "^1.9", From 0db27d651e8de5966592d3c9eee2b595c191d1d8 Mon Sep 17 00:00:00 2001 From: Janne Suominen Date: Tue, 15 Oct 2024 07:55:43 +0300 Subject: [PATCH 2/7] docs: Changelog --- CHANGELOG.md | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5a9bb2d90..9a7216c2b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,17 @@ - e40c9e132 Hotfix UHF-10750 - 2024.13.1 - ac7621f99 UHF-10750: Add check for missing label text - b5538eb75 Update configuration (#1495) - +- 725fe14f7 Automatic update (#1507) +- 3cba4c25a fix: UHF-10801: Fix tests, both unit & regression (#1502) +- 14c5c50b6 fix: UHF-10813: Hide edit button for application if saving process is not completed (#1508) +- 13c5ba63b feat: UHF-10537: KUVA Erillisavustushakemus (#1484) +- 34dc39afc fix: UHF-10813: Remove SUBMITTED status from editable list. (#1505) +- 8b405d8cf Fix file deletion +- 18192476b Automatic update (#1504) +- 5c684a783 Merge branch 'develop' into release/2024.14 +- a63faa9bd fix: UHF-10736: Make sure that uploaded attachments are properly set to application data. (#1496) +- 5773c2004 Update configuration (#1501) +- 57648e948 Version + changelog ## 2024.13 - 9465ef688 Update configuration (#1492) From 98d7959cb4d004e30e90c9b3a030fa3c153d14bd Mon Sep 17 00:00:00 2001 From: Janne Suominen Date: Tue, 22 Oct 2024 07:47:46 +0300 Subject: [PATCH 3/7] docs: Changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9a7216c2b..6c06fba43 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,8 @@ - a63faa9bd fix: UHF-10736: Make sure that uploaded attachments are properly set to application data. (#1496) - 5773c2004 Update configuration (#1501) - 57648e948 Version + changelog +- 927c79293 fix: UHF-10650: Uncomment the printing script to make printing button work again (#1512) +- e2d0d519f fix: UHF-10142: Allow "Delete" button to show on RECEIVED applications when navigating on the form. (#1510) ## 2024.13 - 9465ef688 Update configuration (#1492) From 3bbb91b4536a463896003c57b8981c5cce03e71a Mon Sep 17 00:00:00 2001 From: Janne Suominen Date: Wed, 23 Oct 2024 10:39:03 +0300 Subject: [PATCH 4/7] Update pubsub.sh --- docker/openshift/crons/pubsub.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/openshift/crons/pubsub.sh b/docker/openshift/crons/pubsub.sh index be359b9f0..9322fdf87 100644 --- a/docker/openshift/crons/pubsub.sh +++ b/docker/openshift/crons/pubsub.sh @@ -1,10 +1,10 @@ #!/bin/bash -echo "Running PubSub daemon: $(date +'%Y-%m-%dT%H:%M:%S%:z')" +#echo "Running PubSub daemon: $(date +'%Y-%m-%dT%H:%M:%S%:z')" while true do # PubSub process exists with success return code after # certain number of messages and should then be restarted. - drush helfi:azure:pubsub-listen || exit 1 +# drush helfi:azure:pubsub-listen || exit 1 done From 17fd132d1d5a4e63114ecd3bf938347809fd47a0 Mon Sep 17 00:00:00 2001 From: Janne Suominen Date: Wed, 23 Oct 2024 15:40:05 +0300 Subject: [PATCH 5/7] fix: UHF-10884: Change postnumero field to textfield and apply pattern. (#1524) --- conf/cmi/language/en/webform.webform.kuva_projekti.yml | 1 + conf/cmi/language/sv/webform.webform.kuva_projekti.yml | 1 + conf/cmi/webform.webform.kuva_projekti.yml | 5 +++-- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/conf/cmi/language/en/webform.webform.kuva_projekti.yml b/conf/cmi/language/en/webform.webform.kuva_projekti.yml index c838ee0ab..25b02d5ff 100644 --- a/conf/cmi/language/en/webform.webform.kuva_projekti.yml +++ b/conf/cmi/language/en/webform.webform.kuva_projekti.yml @@ -199,6 +199,7 @@ elements: | '#title': 'Premise name' postinumero: '#title': 'Postal code' + '#pattern_error': 'Please enter a valid 5-digit postal code.' kyseessa_on_kaupungin_omistama_tila: '#title': 'City owns the property' '#options': diff --git a/conf/cmi/language/sv/webform.webform.kuva_projekti.yml b/conf/cmi/language/sv/webform.webform.kuva_projekti.yml index bfcbd96bd..2962bcbd2 100644 --- a/conf/cmi/language/sv/webform.webform.kuva_projekti.yml +++ b/conf/cmi/language/sv/webform.webform.kuva_projekti.yml @@ -202,6 +202,7 @@ elements: | '#title': Namn postinumero: '#title': Postnummer + '#pattern_error': 'Vänligen ange ett giltigt 5-siffrigt postnummer.' kyseessa_on_kaupungin_omistama_tila: '#title': 'Stadens eget utrymme' '#options': diff --git a/conf/cmi/webform.webform.kuva_projekti.yml b/conf/cmi/webform.webform.kuva_projekti.yml index 9ac86fd87..b72a931f4 100644 --- a/conf/cmi/webform.webform.kuva_projekti.yml +++ b/conf/cmi/webform.webform.kuva_projekti.yml @@ -682,12 +682,13 @@ elements: |- class: - webform--large postinumero: - '#type': number + '#type': textfield '#title': Postinumero '#attributes': class: - webform--small - '#input_mask': '99999' + '#pattern': '^[0-9]{5}$' + '#pattern_error': 'Syötä 5 numeroinen postinumero.' '#required': true kyseessa_on_kaupungin_omistama_tila: '#type': radios From 037d01765751374c31cbb0de65ae36d87268db1e Mon Sep 17 00:00:00 2001 From: Janne Suominen Date: Wed, 23 Oct 2024 15:56:47 +0300 Subject: [PATCH 6/7] Pubsub comments --- docker/openshift/crons/pubsub.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/openshift/crons/pubsub.sh b/docker/openshift/crons/pubsub.sh index 9322fdf87..c20c01a4c 100644 --- a/docker/openshift/crons/pubsub.sh +++ b/docker/openshift/crons/pubsub.sh @@ -2,9 +2,9 @@ #echo "Running PubSub daemon: $(date +'%Y-%m-%dT%H:%M:%S%:z')" -while true -do +#while true +#do # PubSub process exists with success return code after # certain number of messages and should then be restarted. # drush helfi:azure:pubsub-listen || exit 1 -done +#done From e51bb9c9e2081c3c15b91bf2bfb53a8c16d9452a Mon Sep 17 00:00:00 2001 From: Janne Suominen Date: Thu, 24 Oct 2024 08:11:08 +0300 Subject: [PATCH 7/7] Production config for 2 applications --- conf/cmi/webform.webform.kasvatus_ja_koulutus_yleisavustu.yml | 3 ++- conf/cmi/webform.webform.taide_ja_kulttuuriavustukset_tai.yml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/conf/cmi/webform.webform.kasvatus_ja_koulutus_yleisavustu.yml b/conf/cmi/webform.webform.kasvatus_ja_koulutus_yleisavustu.yml index 336be51d3..e9992f05f 100644 --- a/conf/cmi/webform.webform.kasvatus_ja_koulutus_yleisavustu.yml +++ b/conf/cmi/webform.webform.kasvatus_ja_koulutus_yleisavustu.yml @@ -19,7 +19,7 @@ third_party_settings: 48: '48' applicationTargetGroup: '21' applicationOpen: '2024-04-02T00:00:00' - applicationClose: '2024-10-04T16:00:00' + applicationClose: '2024-10-23T16:00:00' applicationContinuous: 0 disableCopying: 0 applicationActingYears: @@ -29,6 +29,7 @@ third_party_settings: applicationActingYearsNextCount: '' status: released parent: '' + avus2BreakingChange: false weight: 0 open: null close: null diff --git a/conf/cmi/webform.webform.taide_ja_kulttuuriavustukset_tai.yml b/conf/cmi/webform.webform.taide_ja_kulttuuriavustukset_tai.yml index ea879a6e1..85d272c13 100644 --- a/conf/cmi/webform.webform.taide_ja_kulttuuriavustukset_tai.yml +++ b/conf/cmi/webform.webform.taide_ja_kulttuuriavustukset_tai.yml @@ -17,7 +17,7 @@ third_party_settings: 62: '62' applicationTargetGroup: '22' applicationOpen: '2024-06-05T08:26:00' - applicationClose: '2024-09-26T16:02:00' + applicationClose: '2024-10-12T10:00:00' applicationContinuous: 0 disableCopying: 1 applicationActingYearsType: next_x_years @@ -28,6 +28,7 @@ third_party_settings: applicationActingYearsNextCount: '1' status: released parent: '' + avus2BreakingChange: false weight: 0 open: null close: null