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

Dev to main
City-of-Helsinki · Apr 20, 2023 · 9c910af · 9c910af
2 parents dab762d + dbc52b5
commit 9c910af
Show file tree

Hide file tree

Showing 34 changed files with 76 additions and 37 deletions.
diff --git a/.github/workflows/update-config.yml b/.github/workflows/update-config.yml
@@ -39,7 +39,7 @@ jobs:
         run: |
           composer install
           $(drush sql:connect) < latest.sql
-          drush deploy
+          drush cim -y && drush updb -y && drush cr
           composer update drupal/helfi_* drupal/hdbt* -W
           drush cr && drush updb -y && drush cex -y
           # Update platform

diff --git a/composer.lock b/composer.lock
diff --git a/conf/cmi/core.entity_form_display.paragraph.news_list.default.yml b/conf/cmi/core.entity_form_display.paragraph.news_list.default.yml
@@ -14,7 +14,7 @@ dependencies:
     - select2
     - text
 _core:
-  default_config_hash: MgCTCdxVzcVYEjHn8sEq3m1aQtT4ZKT1JAcLScBch44
+  default_config_hash: I_u6U4oQKvo0EjopuKoM3qEFFz3lzE8J-jWIN0OJqYg
 id: paragraph.news_list.default
 targetEntityType: paragraph
 bundle: news_list

diff --git a/conf/cmi/core.entity_form_display.paragraph.social_media_link.default.yml b/conf/cmi/core.entity_form_display.paragraph.social_media_link.default.yml
@@ -7,10 +7,10 @@ dependencies:
     - field.field.paragraph.social_media_link.field_social_media_link
     - paragraphs.paragraphs_type.social_media_link
   module:
-    - link
     - hdbt_admin_tools
+    - link
 _core:
-  default_config_hash: tDxBNw8YR1W7aF9xxBj7hnkhn4jEogjXacxgoPweawU
+  default_config_hash: aWojfz5AeLM97eeoyKxUlJpYkuG2X8qLl2KOaczBukY
 id: paragraph.social_media_link.default
 targetEntityType: paragraph
 bundle: social_media_link

diff --git a/conf/cmi/core.entity_view_display.paragraph.contact_card.default.yml b/conf/cmi/core.entity_view_display.paragraph.contact_card.default.yml
@@ -15,18 +15,19 @@ dependencies:
     - paragraphs.paragraphs_type.contact_card
   module:
     - entity_reference_revisions
+    - helfi_platform_config
     - image
     - telephone
 _core:
-  default_config_hash: ukFgqFjQ470JApRBQfMv8SZ8umtkb9xck9fZBEWHLKs
+  default_config_hash: X5x-5vSXj4FHXf2NNNyzzwVH7xlQUk6wGBYjejfb-iQ
 id: paragraph.contact_card.default
 targetEntityType: paragraph
 bundle: contact_card
 mode: default
 content:
   field_contact_description:
     type: text_span
-    label: visually_hidden
+    label: hidden
     settings: {  }
     third_party_settings: {  }
     weight: 5
@@ -52,7 +53,7 @@ content:
     region: content
   field_contact_name:
     type: string
-    label: visually_hidden
+    label: hidden
     settings:
       link_to_entity: false
     third_party_settings: {  }
@@ -69,22 +70,22 @@ content:
     region: content
   field_contact_title:
     type: string
-    label: visually_hidden
+    label: hidden
     settings:
       link_to_entity: false
     third_party_settings: {  }
     weight: 2
     region: content
   field_email:
     type: email_mailto
-    label: visually_hidden
+    label: hidden
     settings: {  }
     third_party_settings: {  }
     weight: 4
     region: content
   field_phone_number:
     type: telephone_link
-    label: visually_hidden
+    label: hidden
     settings:
       title: ''
     third_party_settings: {  }

diff --git a/conf/cmi/core.entity_view_display.paragraph.news_list.default.yml b/conf/cmi/core.entity_view_display.paragraph.news_list.default.yml
@@ -13,7 +13,7 @@ dependencies:
   module:
     - text
 _core:
-  default_config_hash: Lff1gHanVEf5OcKwvMxWHX0Chv_SlOGHu9Wke_-F9y8
+  default_config_hash: eCdT_XU1aIhxOLfurTn16KTFSsxHyWZu3HHm3q_5Mi8
 id: paragraph.news_list.default
 targetEntityType: paragraph
 bundle: news_list

diff --git a/conf/cmi/core.entity_view_display.paragraph.social_media_link.default.yml b/conf/cmi/core.entity_view_display.paragraph.social_media_link.default.yml
@@ -7,10 +7,10 @@ dependencies:
     - field.field.paragraph.social_media_link.field_social_media_link
     - paragraphs.paragraphs_type.social_media_link
   module:
-    - link
     - hdbt_admin_tools
+    - link
 _core:
-  default_config_hash: R04V_PfwK58f0cqACEAJAQ5SLoVTL_DUGjvHotl3QzA
+  default_config_hash: WtJ8D0kqvYryjBD0kBTGg0SOQkCyGq7qF-uD4W_3z9g
 id: paragraph.social_media_link.default
 targetEntityType: paragraph
 bundle: social_media_link

diff --git a/conf/cmi/external_entities.external_entity_type.helfi_news.yml b/conf/cmi/external_entities.external_entity_type.helfi_news.yml
@@ -3,7 +3,7 @@ langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: LHjSxv6kFsoLp07coZ2zMnuWp3cKGk6Q3lxRTr-ql70
+  default_config_hash: imFLQtHenUWCDEXySYBm0H7gJ55i3_AF8zALft8uiqo
 id: helfi_news
 label: 'Helfi: News'
 label_plural: 'Helfi: News'
@@ -34,7 +34,7 @@ field_mapper_config:
     short_title:
       value: '$.attributes[''short_title'']'
 storage_client_id: helfi_news
-storage_client_config: null
+storage_client_config: {  }
 persistent_cache_max_age: 1800
 annotation_entity_type_id: null
 annotation_bundle_id: null

diff --git a/conf/cmi/external_entities.external_entity_type.helfi_news_groups.yml b/conf/cmi/external_entities.external_entity_type.helfi_news_groups.yml
@@ -2,6 +2,8 @@ uuid: 1da002e9-9fed-4c57-b25e-0e97906f83ea
 langcode: en
 status: true
 dependencies: {  }
+_core:
+  default_config_hash: zCk_D7oSjREqCU2vFZI4uyGywY_PFNicpUIFuWxtawA
 id: helfi_news_groups
 label: 'Helfi: News groups'
 label_plural: 'Helfi: News groups'

diff --git a/conf/cmi/external_entities.external_entity_type.helfi_news_neighbourhoods.yml b/conf/cmi/external_entities.external_entity_type.helfi_news_neighbourhoods.yml
@@ -2,6 +2,8 @@ uuid: 9184c2bc-f075-42ca-8364-9d8b4e670581
 langcode: en
 status: true
 dependencies: {  }
+_core:
+  default_config_hash: p1queceC0XdJdYY5diRNVw-hdAFymgdpq7fhQudsddE
 id: helfi_news_neighbourhoods
 label: 'Helfi: News neighbourhoods'
 label_plural: 'Helfi: News neighbourhoods'

diff --git a/conf/cmi/external_entities.external_entity_type.helfi_news_tags.yml b/conf/cmi/external_entities.external_entity_type.helfi_news_tags.yml
@@ -2,6 +2,8 @@ uuid: 9f273603-4571-4838-ba73-5c6fb87e8467
 langcode: en
 status: true
 dependencies: {  }
+_core:
+  default_config_hash: OdJNKJELJhbOjN4qCgGAHw_Ypudx5Kt3NqcwLn2qbx0
 id: helfi_news_tags
 label: 'Helfi: News tags'
 label_plural: 'Helfi: News tags'

diff --git a/conf/cmi/field.field.paragraph.contact_card.field_contact_social_media.yml b/conf/cmi/field.field.paragraph.contact_card.field_contact_social_media.yml
@@ -9,7 +9,7 @@ dependencies:
   module:
     - entity_reference_revisions
 _core:
-  default_config_hash: QHbMutsxDDQ1YAxKNp1M0uOFZpE9bAsgCJWUZx_571w
+  default_config_hash: _iSBK3sYqVn5QyzC_C451nR3IF0EGhan4bEp1liTbiU
 id: paragraph.contact_card.field_contact_social_media
 field_name: field_contact_social_media
 entity_type: paragraph

diff --git a/conf/cmi/field.field.paragraph.contact_card.field_contact_title.yml b/conf/cmi/field.field.paragraph.contact_card.field_contact_title.yml
@@ -6,7 +6,7 @@ dependencies:
     - field.storage.paragraph.field_contact_title
     - paragraphs.paragraphs_type.contact_card
 _core:
-  default_config_hash: 3_-eiSIFayhR_hbFNjQDMu1oq8JCPYQ1v1lpVExyWOo
+  default_config_hash: pbFbrbO2unkgfSmtKMvjmixhJIx4Ac1sZ3r7u77lIC4
 id: paragraph.contact_card.field_contact_title
 field_name: field_contact_title
 entity_type: paragraph

diff --git a/conf/cmi/field.field.paragraph.contact_card_listing.field_contact_card.yml b/conf/cmi/field.field.paragraph.contact_card_listing.field_contact_card.yml
@@ -9,7 +9,7 @@ dependencies:
   module:
     - entity_reference_revisions
 _core:
-  default_config_hash: ahiIf8mL1Cvo-3b4xbtntl38eYtquEjbnaiBkI5ljRM
+  default_config_hash: zR-r30I0kOV247OcU6yxNT2re2IFSq7pUjNogusJVxw
 id: paragraph.contact_card_listing.field_contact_card
 field_name: field_contact_card
 entity_type: paragraph

diff --git a/conf/cmi/field.field.paragraph.contact_card_listing.field_title.yml b/conf/cmi/field.field.paragraph.contact_card_listing.field_title.yml
@@ -6,7 +6,7 @@ dependencies:
     - field.storage.paragraph.field_title
     - paragraphs.paragraphs_type.contact_card_listing
 _core:
-  default_config_hash: wVwE7xrXuQ3BymCdqpyrTEoV_pKubFHD709zQ7JDZW4
+  default_config_hash: kdKc_1jRpFFpVgiylfofxe6JZyl5xOjMYEAlvcwPdCU
 id: paragraph.contact_card_listing.field_title
 field_name: field_title
 entity_type: paragraph

diff --git a/conf/cmi/field.field.paragraph.news_list.field_helfi_news_groups.yml b/conf/cmi/field.field.paragraph.news_list.field_helfi_news_groups.yml
@@ -5,6 +5,8 @@ dependencies:
   config:
     - field.storage.paragraph.field_helfi_news_groups
     - paragraphs.paragraphs_type.news_list
+_core:
+  default_config_hash: nmozVFbkBc-ubKtpWG_OgdeT4yNxsLcsbBYaGDHRnUQ
 id: paragraph.news_list.field_helfi_news_groups
 field_name: field_helfi_news_groups
 entity_type: paragraph

diff --git a/conf/cmi/field.field.paragraph.news_list.field_helfi_news_neighbourhoods.yml b/conf/cmi/field.field.paragraph.news_list.field_helfi_news_neighbourhoods.yml
@@ -5,6 +5,8 @@ dependencies:
   config:
     - field.storage.paragraph.field_helfi_news_neighbourhoods
     - paragraphs.paragraphs_type.news_list
+_core:
+  default_config_hash: If5nJKeaunQ7ITUWZ4daCyykb7mslZDLTVrLX7Gd1Qw
 id: paragraph.news_list.field_helfi_news_neighbourhoods
 field_name: field_helfi_news_neighbourhoods
 entity_type: paragraph

diff --git a/conf/cmi/field.field.paragraph.news_list.field_helfi_news_tags.yml b/conf/cmi/field.field.paragraph.news_list.field_helfi_news_tags.yml
@@ -5,6 +5,8 @@ dependencies:
   config:
     - field.storage.paragraph.field_helfi_news_tags
     - paragraphs.paragraphs_type.news_list
+_core:
+  default_config_hash: imhJdbO9eLYZPslj0VosAANrRZBizg4wyPgIYQ3SOXc
 id: paragraph.news_list.field_helfi_news_tags
 field_name: field_helfi_news_tags
 entity_type: paragraph

diff --git a/conf/cmi/field.field.paragraph.news_list.field_news_list_description.yml b/conf/cmi/field.field.paragraph.news_list.field_news_list_description.yml
@@ -12,6 +12,8 @@ third_party_settings:
   allowed_formats:
     allowed_formats:
       - minimal
+_core:
+  default_config_hash: EIpWpSFct6BBIBWOTpd87zJbnbSe0QLPeFLW9-LP1-o
 id: paragraph.news_list.field_news_list_description
 field_name: field_news_list_description
 entity_type: paragraph

diff --git a/conf/cmi/field.field.paragraph.news_list.field_news_list_title.yml b/conf/cmi/field.field.paragraph.news_list.field_news_list_title.yml
@@ -5,6 +5,8 @@ dependencies:
   config:
     - field.storage.paragraph.field_news_list_title
     - paragraphs.paragraphs_type.news_list
+_core:
+  default_config_hash: BVbXiEVCf8X8ZJUYKyiiyevct1RogayM-YXEWiSnuDw
 id: paragraph.news_list.field_news_list_title
 field_name: field_news_list_title
 entity_type: paragraph

diff --git a/conf/cmi/field.field.paragraph.social_media_link.field_icon.yml b/conf/cmi/field.field.paragraph.social_media_link.field_icon.yml
@@ -8,7 +8,7 @@ dependencies:
   module:
     - hdbt_admin_tools
 _core:
-  default_config_hash: lvgcvPv34Bw-DXlz67PyI8wVfAGk6FiOnp-u0Ql35GU
+  default_config_hash: wqE_Zq3v_7AaVAV9KOkhWdkkT_SJTl-Z7wNW6DxFaXI
 id: paragraph.social_media_link.field_icon
 field_name: field_icon
 entity_type: paragraph

diff --git a/conf/cmi/field.storage.paragraph.field_contact_card.yml b/conf/cmi/field.storage.paragraph.field_contact_card.yml
@@ -9,7 +9,7 @@ dependencies:
     config:
       - paragraphs.paragraphs_type.contact_card_listing
 _core:
-  default_config_hash: 9CXmH7Y-XH4RQUNfGNuKswYhJ9n4pf9SX1UcJAzV55o
+  default_config_hash: hrjTJNnrxG5N3Ui9q7IAhEBLr4FburA9QNAA1X0FhTo
 id: paragraph.field_contact_card
 field_name: field_contact_card
 entity_type: paragraph

diff --git a/conf/cmi/field.storage.paragraph.field_contact_social_media.yml b/conf/cmi/field.storage.paragraph.field_contact_social_media.yml
@@ -9,7 +9,7 @@ dependencies:
     config:
       - paragraphs.paragraphs_type.contact_card
 _core:
-  default_config_hash: 1H9u881LSxLCHsrduHm-5yTBSUFBF29lwiH_IjbeJBk
+  default_config_hash: JHpZWWkBGCdrVGR6FpM2u4rbduOL4NCt2ihnVsSkYRc
 id: paragraph.field_contact_social_media
 field_name: field_contact_social_media
 entity_type: paragraph

diff --git a/conf/cmi/field.storage.paragraph.field_helfi_news_groups.yml b/conf/cmi/field.storage.paragraph.field_helfi_news_groups.yml
@@ -5,6 +5,8 @@ dependencies:
   module:
     - external_entities
     - paragraphs
+_core:
+  default_config_hash: _fM_KH15dd3VWM1oQkpfJUipPHD3pK-CiqLPcuj5ssQ
 id: paragraph.field_helfi_news_groups
 field_name: field_helfi_news_groups
 entity_type: paragraph

diff --git a/conf/cmi/field.storage.paragraph.field_helfi_news_neighbourhoods.yml b/conf/cmi/field.storage.paragraph.field_helfi_news_neighbourhoods.yml
@@ -5,6 +5,8 @@ dependencies:
   module:
     - external_entities
     - paragraphs
+_core:
+  default_config_hash: VVgm-VdlvDCYm-mIewtHi0RZp_7pCoE94esxuAat4CE
 id: paragraph.field_helfi_news_neighbourhoods
 field_name: field_helfi_news_neighbourhoods
 entity_type: paragraph

diff --git a/conf/cmi/field.storage.paragraph.field_helfi_news_tags.yml b/conf/cmi/field.storage.paragraph.field_helfi_news_tags.yml
@@ -5,6 +5,8 @@ dependencies:
   module:
     - external_entities
     - paragraphs
+_core:
+  default_config_hash: nWHDiteOOAcjVLeo90MtcJBVL0ABYuABPztRIvhiv_0
 id: paragraph.field_helfi_news_tags
 field_name: field_helfi_news_tags
 entity_type: paragraph

diff --git a/conf/cmi/field.storage.paragraph.field_news_list_description.yml b/conf/cmi/field.storage.paragraph.field_news_list_description.yml
@@ -5,6 +5,8 @@ dependencies:
   module:
     - paragraphs
     - text
+_core:
+  default_config_hash: V_erLPi4c9bT-uhAlgcpJJX8LbR02Btsi8yzMVAIpo4
 id: paragraph.field_news_list_description
 field_name: field_news_list_description
 entity_type: paragraph

diff --git a/conf/cmi/field.storage.paragraph.field_news_list_title.yml b/conf/cmi/field.storage.paragraph.field_news_list_title.yml
@@ -4,6 +4,8 @@ status: true
 dependencies:
   module:
     - paragraphs
+_core:
+  default_config_hash: xapLq-jZodnhyWktgf76RTu9dEBAgWBq-ay41DJpsXQ
 id: paragraph.field_news_list_title
 field_name: field_news_list_title
 entity_type: paragraph

diff --git a/conf/cmi/field.storage.paragraph.field_social_media_link.yml b/conf/cmi/field.storage.paragraph.field_social_media_link.yml
@@ -9,7 +9,7 @@ dependencies:
     config:
       - paragraphs.paragraphs_type.social_media_link
 _core:
-  default_config_hash: 1xLQ-NmVVuQrMJICy3v3H1gDVe3t6nNY5sdEMlEYgoU
+  default_config_hash: '-njlxNwWIC8XUfPK115lFcUTt2_i0Lm6ldsKWrh6Ge8'
 id: paragraph.field_social_media_link
 field_name: field_social_media_link
 entity_type: paragraph

diff --git a/conf/cmi/language/sv/field.field.paragraph.news_list.field_news_list_description.yml b/conf/cmi/language/sv/field.field.paragraph.news_list.field_news_list_description.yml
@@ -1 +1 @@
-label: Kuvaus
+label: Beskrivning
diff --git a/conf/cmi/language/sv/field.field.paragraph.news_list.field_news_list_title.yml b/conf/cmi/language/sv/field.field.paragraph.news_list.field_news_list_title.yml
@@ -1 +1 @@
-label: Otsikko
+label: Titel
diff --git a/conf/cmi/rest.resource.helfi_debug_data.yml b/conf/cmi/rest.resource.helfi_debug_data.yml
@@ -18,3 +18,4 @@ configuration:
   authentication:
     - cookie
     - basic_auth
+    - basic_auth