Release 2023.9

CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## 2023.8
+- 8df0d2d config: Update configuration (#185)
+- d5f7c07 fix: LOM-492: Webform name to 403 page and title (#183)
+- 3c88fce fix: LOM-347, LOM-454, LOM-456: change webform fields (#179)
+- 62528c8 feat:  LOM-458: autologout end profiili session (#182)
+- bf54935 fix: LOM-472: Fix formId if appEnv is prod (#177)
+- 9605941 config: Update configuration (#175)
+- e283647 feat: LOM-462: Autologout style changes from AVUS
+- 59e8257 fix: LOM-480: add asterisk notification (#178)
+- 3a93959 fix: LOM-440: autologout translations (#176)
+
 ## 2023.8
 - cb83c51 config: Update configuration, initial big merge. (#166)
 

composer.json

@@ -6,7 +6,7 @@
     "homepage": "https://github.com/City-of-Helsinki/drupal-helfi-platform",
     "minimum-stability": "dev",
     "prefer-stable": true,
-    "version": "2023.8",
+    "version": "2023.9",
     "require": {
         "ext-json": "*",
         "composer/installers": "^1.9",

conf/cmi/autologout.settings.yml

@@ -1,28 +1,28 @@
 _core:
   default_config_hash: pYO-DH32fm7GYMJrNx5syvfx2n-5s88kvuddFKXC758
 enabled: true
-timeout: 1800
+timeout: 900
 max_timeout: 172800
-padding: 60
+padding: 300
 logout_regardless_of_activity: false
 no_individual_logout_threshold: true
 role_logout: false
 role_logout_max: false
 redirect_url: /
 no_dialog: false
-message: 'Your session is about to expire. Do you want to reset it?'
-inactivity_message: 'You have been logged out due to inactivity.'
+message: 'Your session is about to end. Do you want to continue?'
+inactivity_message: 'Your session is about to end. Do you want to continue?'
 inactivity_message_type: status
 modal_width: 450
 enforce_admin: false
 jstimer_format: '%hours%:%mins%:%secs%'
 jstimer_js_load_option: false
 use_alt_logout_method: false
 use_watchdog: true
-dialog_title: 'Lomeketyökalu Alert'
+dialog_title: 'The session is about to end'
 disable_buttons: false
-yes_button: ''
-no_button: ''
+yes_button: 'Continue session'
+no_button: 'Log out'
 whitelisted_ip_addresses: ''
 cookie_secure: true
 cookie_samesite: Lax

conf/cmi/core.extension.yml

@@ -6,6 +6,7 @@ module:
   allowed_formats: 0
   autologout: 0
   autologout_extend: 0
+  basic_auth: 0
   block: 0
   block_content: 0
   breakpoint: 0

conf/cmi/language/en/webform.webform.todistusjaljennospyynto_tilaus.yml

@@ -1,32 +1,36 @@
 title: 'Requesting copies of certificates'
 elements: |
+  tietoja_tasta_lomakkeesta:
+    '#title': 'About this form'
+  tietoja_todistusjaljennoksesta_markup:
+    '#markup': 'Use this form to order comprehensive school certificates issued after 1995 and general upper secondary school certificates issued after 2005.'
   tilaaja:
-    '#title': 'The person requesting a copy'
+    '#title': Orderer
   profile_fields:
     '#title': 'The following personal information has been fetched from your Helsinki-profile.'
   tilattava_todistus:
-    '#title': 'Report copy requested'
+    '#title': Certificate
   valitse_tilattava_todistus:
-    '#title': 'Choose school report'
+    '#title': 'Select the desired certificate'
     '#options':
       'Peruskoulun päättötodistus': 'Comprehensive school certificate'
-      'Peruskoulun erotodistus': 'Comprehensive school report, studies not completed'
-      'Lisäopetuksen 10.lk todistus': 'Certificate of additional studies, 10th form'
-      'Lukion päättötodistus': 'Upper secondary school certificate'
-      'Lukion erotodistus': 'Upper secondary school report, studies not completed'
+      'Peruskoulun erotodistus': 'Certificate of termination of studies, comprehensive school'
+      'Lisäopetuksen 10.lk todistus': 'Certificate of voluntary additional basic education, 10th grade'
+      'Lukion päättötodistus': 'General upper secondary school certificate'
+      'Lukion erotodistus': 'Certificate of resignation, general upper secondary school'
   todistuksen_antanut_helsinkilainen_koulu:
-    '#title': 'School in Helsinki that issued the report'
-    '#description': 'Enter the name of the school, at the time when the school report was issued. '
+    '#title': 'Helsinki school that issued the certificate'
+    '#description': 'Enter the school’s name as it was called when you studied there.'
   toimitustapa:
-    '#title': 'Manner of delivery'
+    '#title': 'Delivery method'
   valitse_toimitustapa:
-    '#title': 'Select delivery method'
-    '#Toimitustapa: Postiennakko__title': 'Cash on delivery'
-    '#Toimitustapa: Nouto__title': Collect
+    '#title': 'Select the delivery method'
     '#Nouto -teksti__title': 'Collect from Educational Division''s archive, Töysänkatu 2 D, 00510 Helsinki'
     '#Info__title': ''
     '#Toimitustapa: Email__title': E-mail
     '#Toimitustapa: Postitoimitus__title': 'Postal delivery'
+    '#Toimitustapa: Postiennakko__title': 'Sent by cash on delivery'
+    '#Toimitustapa: Nouto__title': 'Collect. The document will be picked up from the Education Division''s archive. Töysänkatu 2 D, 00510 Helsinki.'
     '#delivery_method__title': ''
     '#first_name__title': 'First Name'
     '#last_name__title': 'Last Name'
@@ -41,13 +45,14 @@ elements: |
     '#cod_zip_code__title': 'Zip Code'
     '#cod_city__title': City
     '#cod_phone_number__title': 'Phone Number'
-    '#pickup__title': ''
     '#email__title': 'Email Address'
-    '#Postiennakko -teksti__title': 'Cost of the cash on delivery is 9,20 €'
+    '#Postiennakko -teksti__title': 'Sending the document by cash on delivery will cost €9.20'
   lisatiedot:
     '#title': 'Additional information'
   mahdolliset_lisatiedot:
     '#title': 'Possible additional information'
+  rekisteriseloste:
+    '#title': 'Privacy policy'
 description: 'Requesting copies of certificates MVP-version.'
 settings:
-  confirmation_title: 'Request has been sent'
+  confirmation_title: 'Your certificate copy request has been sent'

conf/cmi/language/fi/autologout.settings.yml

@@ -0,0 +1,5 @@
+dialog_title: 'Istunto on päättymässä'
+yes_button: 'Jatka käyttöä'
+no_button: 'Kirjaudu ulos'
+message: 'Istuntosi on päättymässä. Haluatko jatkaa?'
+inactivity_message: 'Istuntosi on päättymässä. Haluatko jatkaa?'

conf/cmi/language/sv/autologout.settings.yml

@@ -0,0 +1,5 @@
+dialog_title: 'Sessionen håller på att gå ut'
+yes_button: Fortsätta
+no_button: 'Logga ut'
+message: 'Din session håller på att gå ut. Vill du fortsätta?'
+inactivity_message: 'Din session håller på att gå ut. Vill du fortsätta?'

conf/cmi/language/sv/webform.webform.todistusjaljennospyynto_tilaus.yml

@@ -1,30 +1,61 @@
 title: 'SV Todistusjäljennöspyyntö, tilaus'
 elements: |
+  tietoja_tasta_lomakkeesta:
+    '#title': 'Information om denna blankett'
+  tietoja_todistusjaljennoksesta_markup:
+    '#markup': 'Med denna blankett kan du beställa avgångs- och skiljebetyg från grundskolan som fåtts efter 1995 samt avgångs- och skiljebetyg från gymnasiet som fåtts efter 2005.'
+  tilaaja:
+    '#title': Beställare
   profile_fields:
     '#title': 'Följande personuppgifter har hämtats från din Helsingfors-profil.'
+  tilattava_todistus:
+    '#title': 'Betyg som beställs'
+  valitse_tilattava_todistus:
+    '#title': 'Välj det betyg som ska beställas'
+    '#options':
+      'Peruskoulun päättötodistus': 'Avgångsbetyg från grundskolan'
+      'Peruskoulun erotodistus': 'Skiljebetyg från grundskolan'
+      'Lisäopetuksen 10.lk todistus': 'Betyg för påbyggnadsundervisning i årskurs 10'
+      'Lukion päättötodistus': 'Avgångsbetyg från gymnasiet'
+      'Lukion erotodistus': 'Skiljebetyg från gymnasiet'
+  todistuksen_antanut_helsinkilainen_koulu:
+    '#title': 'Den skola i Helsingfors som gett betyget'
+    '#description': 'Ange skolans namn i den form som gällde när du studerade där.'
+  toimitustapa:
+    '#title': Leveransmetod
   valitse_toimitustapa:
+    '#title': 'Välj leveransmetod'
+    '#Nouto -teksti__title': 'Hämtas från fostrans- och utbildningssektorns arkiv. Töysänkatu 2 D, 00510 Helsinki'
     '#Info__title': ''
+    '#Toimitustapa: Postiennakko__title': Postförskott
+    '#Toimitustapa: Nouto__title': 'Upphämtning. Hämtas från fostrans- och utbildningssektorns arkiv. Töysänkatu 2 D, 00510 Helsinki.'
     '#delivery_method__title': ''
-    '#first_name__title': ''
-    '#last_name__title': ''
-    '#street_address__title': ''
-    '#zip_code__title': ''
-    '#city__title': ''
-    '#phone_number__title': ''
+    '#first_name__title': 'Förnamn'
+    '#last_name__title': 'Efternamn'
+    '#street_address__title': 'Gatuadress'
+    '#zip_code__title': 'Postnummer'
+    '#city__title': 'Stad'
+    '#phone_number__title': 'Telefonnummer'
     '#cod__title': ''
-    '#cod_first_name__title': ''
-    '#cod_last_name__title': ''
-    '#cod_street_address__title': ''
-    '#cod_zip_code__title': ''
-    '#cod_city__title': ''
-    '#cod_phone_number__title': ''
-    '#pickup__title': ''
+    '#cod_first_name__title': 'Förnamn'
+    '#cod_last_name__title': 'Efternamn'
+    '#cod_street_address__title': 'Gatuadress'
+    '#cod_zip_code__title': 'Postnummer'
+    '#cod_city__title': 'Stad'
+    '#cod_phone_number__title': 'Telefonnummer'
     '#email__title': ''
+    '#Postiennakko -teksti__title': 'Postförskottet kostar 9,20 euro för den som beställer dokumentet.'
+  lisatiedot:
+    '#title': 'Ytterligare information'
   mahdolliset_lisatiedot:
     '#title': 'Om ditt namn eller din personbeteckning har ändrats, ange här namn och personbeteckning för tidpunkten då betyget utfärdades.'
+  rekisteriseloste:
+    '#title': Registerbeskrivning
   tutustu_rekisteriselosteeseen:
     '#title': 'L&auml;s mer om <a href="https://www.hel.fi/static/liitteet-2019/Kaupunginkanslia/Rekisteriselosteet/Kasko/Register%20f%C3%B6r%20administration%20av%20grundl%C3%A4ggande%20utbildning.pdf" target="_blank">registerbeskrivningen</a> (l&auml;nken &ouml;ppnas i en ny flik)'
   tutustu_rekisteriselosteeseen_lukio:
     '#title': 'L&auml;s mer om <a href="https://www.hel.fi/static/liitteet-2019/Kaupunginkanslia/Rekisteriselosteet/Kasko/Register%20f%C3%B6r%20administrationen%20av%20studier%20inom%20gymnasieutbildningen.pdf" target="_blank">registerbeskrivningen</a> (l&auml;nken &ouml;ppnas i en ny flik)'
   olen_tutustunut_rekisteriselosteeseen:
     '#title': 'Jag har läst registerbeskrivningen'
+settings:
+  confirmation_title: 'Begäran om betygskopia har skickats'

conf/cmi/media.type.remote_video.yml

@@ -1,7 +1,9 @@
 uuid: 87af06fb-e7d6-4a74-ad4e-b943e6fdc0d6
 langcode: en
 status: true
-dependencies: {  }
+dependencies:
+  module:
+    - crop
 third_party_settings:
   crop:
     image_field: null

conf/cmi/rest.resource.entity.node.yml

@@ -0,0 +1,23 @@
+uuid: c95b69cc-19d9-4047-be9b-fa15d7aeaea0
+langcode: en
+status: true
+dependencies:
+  module:
+    - basic_auth
+    - hal
+    - node
+_core:
+  default_config_hash: t_jfECmZhJqBOJuSOFn87EOi_TWi-_fRYTuJgd19vgg
+id: entity.node
+plugin_id: 'entity:node'
+granularity: resource
+configuration:
+  methods:
+    - GET
+    - POST
+    - PATCH
+    - DELETE
+  formats:
+    - hal_json
+  authentication:
+    - basic_auth

conf/cmi/rest.resource.helfi_debug_data.yml

@@ -3,6 +3,9 @@ langcode: en
 status: true
 dependencies:
   module:
+    - basic_auth
+    - helfi_api_base
+    - serialization
     - user
 id: helfi_debug_data
 plugin_id: helfi_debug_data
@@ -14,3 +17,4 @@ configuration:
     - json
   authentication:
     - cookie
+    - basic_auth

conf/cmi/rest.resource.helfi_debug_package_version.yml

@@ -3,6 +3,9 @@ langcode: en
 status: true
 dependencies:
   module:
+    - basic_auth
+    - helfi_api_base
+    - serialization
     - user
 id: helfi_debug_package_version
 plugin_id: helfi_debug_package_version
@@ -14,3 +17,4 @@ configuration:
     - json
   authentication:
     - cookie
+    - basic_auth

conf/cmi/webform.webform.todistusjaljennospyynto_tilaus.yml

@@ -85,6 +85,11 @@ elements: |-
       '#counter_minimum': 1
       '#counter_maximum': 100
       '#counter_maximum_message': ' '
+    todistuksen_antamisvuosi:
+      '#type': textfield
+      '#title': 'Todistuksen antamisvuosi'
+      '#description': 'Todistuksia etsitään annetusta vuodesta +/- 3 vuoden säteellä'
+      '#required': true
   toimitustapa:
     '#type': webform_section
     '#title': Toimitustapa
@@ -93,8 +98,6 @@ elements: |-
       '#title': 'Valitse toimitustapa'
       '#Toimitustapa: Email__access': false
       '#Toimitustapa: Postitoimitus__access': false
-      '#Toimitustapa: Postiennakko__title': Postiennakko
-      '#Toimitustapa: Nouto__title': Nouto
       '#Nouto -teksti__title': 'Noudetaan kasvatuksen ja koulutuksen toimialan arkistolta. Töysänkatu 2 D, 00510 Helsinki'
   lisatiedot:
     '#type': webform_section

docker/openshift/entrypoints/20-deploy.sh

@@ -13,20 +13,44 @@ if [ ! -n "$OPENSHIFT_BUILD_NAME" ]; then
   exit 1
 fi
 
+function get_deploy_id {
+  echo $(drush state:get deploy_id)
+}
+
 # Generate twig caches.
 if [ ! -d "/tmp/twig" ]; then
   drush twig:compile || true
 fi
 
+# Attempt to set deploy ID in case this is the first deploy.
+if [[ -z "$(get_deploy_id)" ]]; then
+  drush state:set deploy_id $OPENSHIFT_BUILD_NAME
+fi
+
+# Exit early if deploy ID is still not set. This usually means either Redis or
+# something else is down.
+if [[ -z "$(get_deploy_id)" ]]; then
+  echo "Could not fetch deploy ID. Something is probably wrong. Exiting early."
+  exit 1
+fi
+
 # This script is run every time a container is spawned and certain environments might
 # start more than one Drupal container. This is used to make sure we run deploy
 # tasks only once per deploy.
-if [ "$(drush state:get deploy_id)" != "$OPENSHIFT_BUILD_NAME" ]; then
+if [ "$(get_deploy_id)" != "$OPENSHIFT_BUILD_NAME" ]; then
   drush state:set deploy_id $OPENSHIFT_BUILD_NAME
-  # Put site in maintenance mode during deploy
+  # Put site in maintenance mode
   drush state:set system.maintenance_mode 1 --input-format=integer
+  # Run helfi specific pre-deploy tasks. Allow this to fail in case
+  # the environment is not using the 'helfi_api_base' module.
+  # @see https://github.com/City-of-Helsinki/drupal-module-helfi-api-base
+  drush helfi:pre-deploy || true
   # Run maintenance tasks (config import, database updates etc)
   drush deploy
+  # Run helfi specific post deploy tasks. Allow this to fail in case
+  # the environment is not using the 'helfi_api_base' module.
+  # @see https://github.com/City-of-Helsinki/drupal-module-helfi-api-base
+  drush helfi:post-deploy || true
   # Disable maintenance mode
   drush state:set system.maintenance_mode 0 --input-format=integer
 fi

public/modules/custom/autologout_extend/autologout_extend.module

@@ -5,6 +5,8 @@
  * Automated Logout extend - Module.
  */
 
+use Drupal\Core\Url;
+
 /**
  * Implements hook_page_attachments_alter().
  */
@@ -22,6 +24,10 @@ function autologout_extend_page_attachments_alter(array &$attachments) {
     return;
   }
 
+  $redirect_logout_url = Url::fromRoute('user.logout');
+
+  $attachments['#attached']['drupalSettings']['autologout']['redirect_url'] = $redirect_logout_url->toString();
+
   $session_time_left = $openid_expire - REQUEST_TIME;
   $time_remaining_threshold = \Drupal::config('autologout_extend.settings')
     ->get('forced_dialog_trigger_threshold');

public/modules/custom/autologout_extend/autologout_extend.services.yml

@@ -8,3 +8,7 @@ services:
     ]
     tags:
       - { name: event_subscriber }
+  autologout_extend.route_subscriber:
+    class: 'Drupal\autologout_extend\EventSubscriber\RouteSubscriber'
+    tags:
+      - { name: event_subscriber }