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

Dev to main
City-of-Helsinki · Apr 20, 2023 · 361feed · 361feed
2 parents d7f4324 + d8b5fb6
commit 361feed
Show file tree

Hide file tree

Showing 18 changed files with 54 additions and 43 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.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: PhtZOF9M7u2XUpd_mrtEfGVJjzlMNobbQzpgabuIzeA
+  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.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: BzWvGC8hEXxFUxhZtUxQ30sNFcsZNIAFC5JX9okISYY
+  default_config_hash: imFLQtHenUWCDEXySYBm0H7gJ55i3_AF8zALft8uiqo
 id: helfi_news
 label: 'Helfi: News'
 label_plural: 'Helfi: News'
@@ -35,7 +35,7 @@ field_mapper_config:
       value: '$.attributes[''short_title'']'
 storage_client_id: helfi_news
 storage_client_config: {  }
-persistent_cache_max_age: 10800
+persistent_cache_max_age: 1800
 annotation_entity_type_id: null
 annotation_bundle_id: null
 annotation_field_name: 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
@@ -3,7 +3,7 @@ langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: XSm-lbRmOWP_eJRFTo14HMiNtxsc5scm42lmq8Qjcy8
+  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
@@ -3,7 +3,7 @@ langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: h4y6pjlsSfKM9cgEi9tWGsJ57_zj1b4CelECji9A1Y0
+  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
@@ -3,7 +3,7 @@ langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: wkWXjXpGr6lPWM3nZ-8RqlBCt7nsAuHiP7EC1Vh4oMc
+  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.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_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/public/sites/default/settings.php b/public/sites/default/settings.php
@@ -128,6 +128,16 @@
   $config['helfi_navigation.api']['key'] = $navigation_authentication_key;
 }
 
+// Make sure project name and app env are defined in GitHub actions too.
+if ($github_repository = getenv('GITHUB_REPOSITORY')) {
+  if (!getenv('APP_ENV')) {
+    putenv('APP_ENV=ci');
+  }
+
+  if (!getenv('PROJECT_NAME')) {
+    putenv('PROJECT_NAME=' . $github_repository);
+  }
+}
 $config['helfi_api_base.environment_resolver.settings']['environment_name'] = getenv('APP_ENV');
 $config['helfi_api_base.environment_resolver.settings']['project_name'] = getenv('PROJECT_NAME');