Merge pull request #665 from City-of-Helsinki/dev

Dev to main
City-of-Helsinki · Jun 29, 2023 · c1eb794 · c1eb794
2 parents 2b4289f + b8da65b
commit c1eb794
Show file tree

Hide file tree

Showing 60 changed files with 674 additions and 415 deletions.
diff --git a/.env b/.env
@@ -18,7 +18,7 @@ STAGE_FILE_PROXY_ORIGIN_DIR=
 SITE_PREFIX="/kaupunkiymparisto-ja-liikenne"
 
 # Docker image
-DRUPAL_IMAGE=ghcr.io/city-of-helsinki/drupal-web:8.1
+DRUPAL_IMAGE=ghcr.io/city-of-helsinki/drupal-web:8.2
 
 # Default source @alias where to sync database and files from
 DRUPAL_SYNC_SOURCE=main

diff --git a/.github/workflows/artifact.yml b/.github/workflows/artifact.yml
@@ -14,7 +14,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/city-of-helsinki/drupal-php-docker:8.1-alpine
+      image: ghcr.io/city-of-helsinki/drupal-php-docker:8.2-alpine
 
     services:
       db:

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -12,7 +12,7 @@ jobs:
   tests:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/city-of-helsinki/drupal-php-docker:8.1-alpine
+      image: ghcr.io/city-of-helsinki/drupal-php-docker:8.2-alpine
 
     services:
       db:

diff --git a/.github/workflows/update-config.yml b/.github/workflows/update-config.yml
@@ -11,7 +11,7 @@ jobs:
   update-config:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/city-of-helsinki/drupal-php-docker:8.1-alpine
+      image: ghcr.io/city-of-helsinki/drupal-php-docker:8.2-alpine
 
     services:
       db:

diff --git a/composer.json b/composer.json
@@ -25,7 +25,7 @@
         "drupal/helfi_tunnistamo": "^2.0",
         "drupal/raven": "^4.0",
         "drupal/redis": "^1.5",
-        "drupal/stage_file_proxy": "^1.2",
+        "drupal/stage_file_proxy": "^2.0",
         "drush/drush": "^11"
     },
     "require-dev": {

diff --git a/composer.lock b/composer.lock
diff --git a/conf/cmi/core.entity_form_display.media.hel_map.default.yml b/conf/cmi/core.entity_form_display.media.hel_map.default.yml
@@ -9,7 +9,7 @@ dependencies:
     - link
     - path
 _core:
-  default_config_hash: oN89Dvqwx-z5slzzRjRxJz-Mnp9ALvUnFg_8XWepQ9U
+  default_config_hash: KoYrc83rhkQSoax9OsIA2u9cRG8e0ZLi1pMQc_S_3Ew
 id: media.hel_map.default
 targetEntityType: media
 bundle: hel_map

diff --git a/conf/cmi/core.entity_form_display.paragraph.hero.default.yml b/conf/cmi/core.entity_form_display.paragraph.hero.default.yml
@@ -3,7 +3,6 @@ langcode: en
 status: true
 dependencies:
   config:
-    - field.field.paragraph.hero.field_hero_bg_color
     - field.field.paragraph.hero.field_hero_desc
     - field.field.paragraph.hero.field_hero_design
     - field.field.paragraph.hero.field_hero_image
@@ -16,18 +15,12 @@ dependencies:
     - media_library
     - text
 _core:
-  default_config_hash: a7HT1FL6Lj9NGy6KYZjyVqpngR4ANDSgnjRSQ15UHmQ
+  default_config_hash: CvDiqRtujItZjhiR7KUf0a9dQrlgEcmuDDhJHmzUNOw
 id: paragraph.hero.default
 targetEntityType: paragraph
 bundle: hero
 mode: default
 content:
-  field_hero_bg_color:
-    type: options_select
-    weight: 1
-    region: content
-    settings: {  }
-    third_party_settings: {  }
   field_hero_desc:
     type: text_textarea
     weight: 3

diff --git a/conf/cmi/core.entity_form_display.paragraph.journey_planner.default.yml b/conf/cmi/core.entity_form_display.paragraph.journey_planner.default.yml
@@ -0,0 +1,34 @@
+uuid: 4921e1b1-09f1-48c0-96ed-51f30175a54e
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.field.paragraph.journey_planner.field_description
+    - field.field.paragraph.journey_planner.field_title
+    - paragraphs.paragraphs_type.journey_planner
+  module:
+    - text
+id: paragraph.journey_planner.default
+targetEntityType: paragraph
+bundle: journey_planner
+mode: default
+content:
+  field_description:
+    type: text_textarea
+    weight: 1
+    region: content
+    settings:
+      rows: 5
+      placeholder: ''
+    third_party_settings: {  }
+  field_title:
+    type: string_textfield
+    weight: 0
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+hidden:
+  created: true
+  status: true
diff --git a/conf/cmi/core.entity_view_display.media.hel_map.default.yml b/conf/cmi/core.entity_view_display.media.hel_map.default.yml
@@ -8,7 +8,7 @@ dependencies:
   module:
     - helfi_media_map
 _core:
-  default_config_hash: xWSewtEWch8WXKgsaRmJi4JxBLjRP0B3hD1JoodX99E
+  default_config_hash: '-iLfHSAepabVQ6yYeAq_cioOuO-5JsvriQSQENHZG80'
 id: media.hel_map.default
 targetEntityType: media
 bundle: hel_map
@@ -18,7 +18,7 @@ content:
     type: hel_media_map
     label: hidden
     settings:
-      link_title: 'Open map in new window'
+      link_title: 'Open larger map'
     third_party_settings: {  }
     weight: 0
     region: content

diff --git a/conf/cmi/core.entity_view_display.media.hel_map.media_library.yml b/conf/cmi/core.entity_view_display.media.hel_map.media_library.yml
@@ -9,7 +9,7 @@ dependencies:
   module:
     - helfi_media_map
 _core:
-  default_config_hash: PPY8kAB9w6Y50NI58k4CEZzyHD3iZAJo6jtujL8VG0Y
+  default_config_hash: BgAdizvooLPfK6uIUYu3Z-02W-SFkGxNpNOwqhF_Kuw
 id: media.hel_map.media_library
 targetEntityType: media
 bundle: hel_map
@@ -19,7 +19,7 @@ content:
     type: hel_media_map
     label: hidden
     settings:
-      link_title: 'Open map in new window'
+      link_title: 'Open larger map'
     third_party_settings: {  }
     weight: 0
     region: content

diff --git a/conf/cmi/core.entity_view_display.media.image.hero.yml b/conf/cmi/core.entity_view_display.media.image.hero.yml
@@ -11,7 +11,7 @@ dependencies:
   module:
     - responsive_image
 _core:
-  default_config_hash: yOUJJysrNA6OZUaL8EmXsFBPwpyOzsnC0fsXT9QGHU4
+  default_config_hash: UX2CrJYBdnGTpSaqiYid65d46ihnZEmWEBJbdXJZQ7g
 id: media.image.hero
 targetEntityType: media
 bundle: image

diff --git a/conf/cmi/core.entity_view_display.paragraph.hero.default.yml b/conf/cmi/core.entity_view_display.paragraph.hero.default.yml
@@ -3,7 +3,6 @@ langcode: en
 status: true
 dependencies:
   config:
-    - field.field.paragraph.hero.field_hero_bg_color
     - field.field.paragraph.hero.field_hero_desc
     - field.field.paragraph.hero.field_hero_design
     - field.field.paragraph.hero.field_hero_image
@@ -16,19 +15,12 @@ dependencies:
     - options
     - text
 _core:
-  default_config_hash: 1S-v2cW15vF64vx-PC3OHbjsxRvtChTWcgepFJ_tKAw
+  default_config_hash: _cEmb8iIMHW_kmY2nlzrMR-ur24Tc0k7N4FGGAvT03k
 id: paragraph.hero.default
 targetEntityType: paragraph
 bundle: hero
 mode: default
 content:
-  field_hero_bg_color:
-    type: list_key
-    label: inline
-    settings: {  }
-    third_party_settings: {  }
-    weight: 5
-    region: content
   field_hero_desc:
     type: text_default
     label: hidden

diff --git a/conf/cmi/core.entity_view_display.paragraph.journey_planner.default.yml b/conf/cmi/core.entity_view_display.paragraph.journey_planner.default.yml
@@ -0,0 +1,32 @@
+uuid: 8af043fd-818c-43e0-ae13-b62f481544e7
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.field.paragraph.journey_planner.field_description
+    - field.field.paragraph.journey_planner.field_title
+    - paragraphs.paragraphs_type.journey_planner
+  module:
+    - text
+id: paragraph.journey_planner.default
+targetEntityType: paragraph
+bundle: journey_planner
+mode: default
+content:
+  field_description:
+    type: text_default
+    label: hidden
+    settings: {  }
+    third_party_settings: {  }
+    weight: 1
+    region: content
+  field_title:
+    type: string
+    label: hidden
+    settings:
+      link_to_entity: false
+    third_party_settings: {  }
+    weight: 0
+    region: content
+hidden:
+  search_api_excerpt: true
diff --git a/conf/cmi/core.entity_view_display.tpr_service.tpr_service.teaser_search_result.yml b/conf/cmi/core.entity_view_display.tpr_service.tpr_service.teaser_search_result.yml
@@ -12,7 +12,7 @@ dependencies:
     - helfi_tpr
     - text
 _core:
-  default_config_hash: ujJDnxXZHiN-DByQZHw7_ftiBEHe7NVqg8JElL2XkCw
+  default_config_hash: xB11NuB4PFanx7E4ETdV0gOTv4_GPPPt-Ix-sw4MKHU
 id: tpr_service.tpr_service.teaser_search_result
 targetEntityType: tpr_service
 bundle: tpr_service

diff --git a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.default.yml b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.default.yml
@@ -190,7 +190,7 @@ content:
     label: hidden
     settings:
       iframe_title: 'Location on map'
-      link_title: 'Open the map in a new window'
+      link_title: 'Open larger map'
       target: true
     third_party_settings: {  }
     weight: 10

diff --git a/conf/cmi/core.extension.yml b/conf/cmi/core.extension.yml
@@ -93,6 +93,8 @@ module:
   imagecache_external: 0
   imagemagick: 0
   inline_form_errors: 0
+  jquery_ui: 0
+  jquery_ui_draggable: 0
   language: 0
   link: 0
   linkit: 0

diff --git a/conf/cmi/field.field.media.hel_map.field_media_hel_map.yml b/conf/cmi/field.field.media.hel_map.field_media_hel_map.yml
@@ -8,7 +8,7 @@ dependencies:
   module:
     - link
 _core:
-  default_config_hash: On6f24BBBA_ky-OTH7lsZHZ86jTxvFgsk0Om9PDhHAE
+  default_config_hash: 6R3OIKGnfzbjAT3CeaZRYfjCcaVYoYtLEJY2R4nFSFc
 id: media.hel_map.field_media_hel_map
 field_name: field_media_hel_map
 entity_type: media

diff --git a/conf/cmi/field.field.node.page.field_content.yml b/conf/cmi/field.field.node.page.field_content.yml
@@ -15,6 +15,7 @@ dependencies:
     - paragraphs.paragraphs_type.event_list
     - paragraphs.paragraphs_type.from_library
     - paragraphs.paragraphs_type.image
+    - paragraphs.paragraphs_type.journey_planner
     - paragraphs.paragraphs_type.list_of_links
     - paragraphs.paragraphs_type.list_of_plans
     - paragraphs.paragraphs_type.map
@@ -42,30 +43,34 @@ settings:
   handler: 'default:paragraph'
   handler_settings:
     target_bundles:
-      list_of_plans: list_of_plans
-      text: text
-      columns: columns
-      image: image
       accordion: accordion
-      list_of_links: list_of_links
+      banner: banner
+      chart: chart
+      columns: columns
       contact_card_listing: contact_card_listing
       content_cards: content_cards
       content_liftup: content_liftup
-      banner: banner
       event_list: event_list
-      news_list: news_list
       from_library: from_library
+      image: image
+      list_of_links: list_of_links
+      list_of_plans: list_of_plans
+      map: map
+      news_list: news_list
       phasing: phasing
-      chart: chart
       remote_video: remote_video
-      map: map
-      unit_search: unit_search
       service_list_search: service_list_search
+      text: text
+      unit_search: unit_search
+      journey_planner: journey_planner
     negate: 0
     target_bundles_drag_drop:
       accordion:
         weight: 0
         enabled: true
+      accordion_item:
+        weight: 38
+        enabled: false
       banner:
         weight: 0
         enabled: true
@@ -75,6 +80,9 @@ settings:
       columns:
         weight: 0
         enabled: true
+      contact_card:
+        weight: 42
+        enabled: false
       contact_card_listing:
         weight: 0
         enabled: true
@@ -84,18 +92,36 @@ settings:
       content_liftup:
         weight: 0
         enabled: true
+      district_and_project_search:
+        weight: 46
+        enabled: false
+      district_listing:
+        weight: 47
+        enabled: false
       event_list:
         weight: 0
         enabled: true
       from_library:
         weight: 0
         enabled: true
+      hero:
+        weight: 50
+        enabled: false
       image:
         weight: 0
         enabled: true
+      journey_planner:
+        weight: 0
+        enabled: true
+      liftup_with_image:
+        weight: 53
+        enabled: false
       list_of_links:
         weight: 0
         enabled: true
+      list_of_links_item:
+        weight: 55
+        enabled: false
       list_of_plans:
         weight: 0
         enabled: true
@@ -108,12 +134,39 @@ settings:
       phasing:
         weight: 0
         enabled: true
+      phasing_item:
+        weight: 60
+        enabled: false
+      popular_service_item:
+        weight: 61
+        enabled: false
+      popular_services:
+        weight: 62
+        enabled: false
+      project_listing:
+        weight: 63
+        enabled: false
       remote_video:
         weight: 0
         enabled: true
+      service_list:
+        weight: 65
+        enabled: false
       service_list_search:
         weight: 0
         enabled: true
+      sidebar_text:
+        weight: 67
+        enabled: false
+      social_media_link:
+        weight: 68
+        enabled: false
+      target_group_link_item:
+        weight: 69
+        enabled: false
+      target_group_links:
+        weight: 70
+        enabled: false
       text:
         weight: 0
         enabled: true