UHF-12838: Add aliases to hakuvahti URLS (#1259)

* Update configuration

* UHF-12838: Add aliases to  hakuvahti URLS

* UHF-12838: Update modules

* UHF-12838: Allow configuring mobilenote lookback offset

* UHF-12838: Update modules

* UHF-12838: Update hakuvahti

* UHF-12838: Update theme

* Update configuration

* UHF-12838: Update theme

* UHF-12838: Update theme

* UHF-12838: Update theme

* UHF-12838: Add map_url on sync

* UHF-12838: check for coordinate count, we can't build link without

* UHF-12838: +- tired eyes :)

* UHF-12838: Fix sv page url

* UHF-12838: Update hakuvahti module

* UHF-12838: Update theme

* UHF-12838: Update packages

---------

Co-authored-by: hel-platta-service <188462459+hel-platta-service@users.noreply.github.com>
Co-authored-by: Tarmo Sundström <tarmo.sundstrom@druid.fi>

Author: 3 people

Makefile

@@ -1,5 +1,6 @@
 PHONY :=
 PROJECT_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
+IS_CONTAINER := $(shell test ${CONTAINER_RUNNING} && echo true || echo false)
 
 # Colors
 NO_COLOR=\033[0m

composer.json

@@ -15,7 +15,7 @@
         "drupal/hdbt_admin": "^3.0",
         "drupal/helfi_azure_fs": "^2.0",
         "drupal/helfi_drupal_tools": "dev-main",
-        "drupal/helfi_hakuvahti": "^1.0",
+        "drupal/helfi_hakuvahti": "^1.2.0",
         "drupal/helfi_navigation": "^2.0",
         "drupal/helfi_platform_config": "^5.0",
         "drupal/helfi_proxy": "^3.0",

composer.lock

@@ -22,4 +22,4 @@ visibility:
   request_path:
     id: request_path
     negate: false
-    pages: "/pysakointi/ajoneuvojen-siirrot/ajoneuvojen-siirtokehotukset\r\n/parking/vehicle-removal/vehicle-removal-requests\r\n/parkering/forflyttning-av-fordon/flyttningsuppmaningar"
+    pages: "/pysakointi/ajoneuvojen-siirrot/ajoneuvojen-siirtokehotukset\r\n/parking/vehicle-removal/vehicle-removal-requests\r\n/parkering/forflyttning-av-fordon/flyttningsuppmaningar-for-fordon"

conf/cmi/block.block.hdbt_subtheme_hakuvahti.yml

@@ -7,7 +7,7 @@ dependencies:
   module:
     - ckeditor5
 _core:
-  default_config_hash: oCDUwt4GjXQJeBCiJlq5NKEU0d9JP2Kx3QZKMuDAi_g
+  default_config_hash: i1fLaAzni2rKBDARlCWA1xa79zo_RYF-8oQ3x9wxgfM
 format: full_html
 editor: ckeditor5
 settings:
@@ -151,6 +151,11 @@ settings:
           weight: 19
           search: '(<a\b[^>]*?)\s+target\s*=\s*("_blank"|_blank)'
           replace: $1
+        -
+          enabled: true
+          weight: 20
+          search: '&nbsp;'
+          replace: ' '
     ckeditor5_sourceEditing:
       allowed_tags:
         - '<figure tabindex>'

conf/cmi/editor.editor.full_html.yml

@@ -7,7 +7,7 @@ dependencies:
   module:
     - ckeditor5
 _core:
-  default_config_hash: 5XykmWxByyrIQ2N9_zHqVQlMtBUy9wc5P9lPrM_g7oQ
+  default_config_hash: oE8ZPS7LMQvOJv0JDM2AJcGyPAti79fl6vzr3v-GWM0
 format: minimal
 editor: ckeditor5
 settings:
@@ -133,6 +133,11 @@ settings:
           weight: 19
           search: '(<a\b[^>]*?)\s+target\s*=\s*("_blank"|_blank)'
           replace: $1
+        -
+          enabled: true
+          weight: 20
+          search: '&nbsp;'
+          replace: ' '
     ckeditor5_sourceEditing:
       allowed_tags:
         - '<p data-chat-trigger>'

conf/cmi/editor.editor.minimal.yml

@@ -8,12 +8,33 @@ id: tunnistamo
 label: Tunnistamo
 plugin: tunnistamo
 settings:
-  client_id: placeholder
-  client_secret: placeholder
+  client_id: ''
+  client_secret: ''
   iss_allowed_domains: ''
-  is_production: 0
+  prompt:
+    login: login
   auto_login: 0
   environment_url: ''
   client_scopes: 'openid,email'
   client_roles: {  }
-  debug_log: false
+  ad_roles:
+    -
+      ad_role: Drupal_Helfi_kaupunkitaso_paakayttajat
+      roles:
+        - admin
+    -
+      ad_role: Drupal_Helfi_Kaupunkiymp_ja_liikenne_sisallontuottajat_laaja
+      roles:
+        - editor
+    -
+      ad_role: Drupal_Helfi_Kaupunkiymp_ja_liikenne_sisallontuottajat_suppea
+      roles:
+        - content_producer
+    -
+      ad_role: Drupal_Helfi_Etusivu_kayttajakyselyt
+      roles:
+        - survey_editor
+    -
+      ad_role: 947058f4-697e-41bb-baf5-f69b49e5579a
+      roles:
+        - super_administrator

conf/cmi/openid_connect.client.tunnistamo.yml

@@ -37,6 +37,11 @@ field_settings:
     datasource_id: mobilenote_data_source
     property_path: geometry
     type: geo_shape
+  map_url:
+    label: 'Map URL'
+    datasource_id: mobilenote_data_source
+    property_path: map_url
+    type: string
   notes:
     label: Notes
     datasource_id: mobilenote_data_source

conf/cmi/search_api.index.mobilenote_data.yml

@@ -2,7 +2,7 @@
 
 while true
 do
-  echo "Running cron: $(date +'%Y-%m-%dT%H:%M:%S%:z')\n"
+  echo "Running cron: $(date +'%Y-%m-%dT%H:%M:%S%:z')"
   drush cron
   # Sleep for 10 minutes.
   sleep 600

docker/openshift/crons/cron.sh

@@ -7,3 +7,5 @@ fi
 
 # Obfuscate user data
 drush sql:sanitize
+# Convert file schemes for Stage file proxy
+drush sql-query "UPDATE file_managed SET uri = REPLACE(uri, 'azure://', 'public://');"