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

Dev to main
City-of-Helsinki · Oct 23, 2024 · d983175 · d983175
2 parents 412a858 + 37121ce
commit d983175
Show file tree

Hide file tree

Showing 84 changed files with 690 additions and 414 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -51,8 +51,8 @@ jobs:
 
       - name: Run PHPCS
         run: |
-          vendor/bin/phpcs public/modules/custom/ --ignore="*.js,*.css" --extensions=php,module,install --standard=Drupal,DrupalPractice
-          vendor/bin/phpcs public/themes/custom/ --ignore="*.js,*.css" --extensions=php,theme --standard=Drupal,DrupalPractice
+          vendor/bin/phpcs public/modules/custom/
+          vendor/bin/phpcs public/themes/custom/
 
       - name: Run phpstan
         run: vendor/bin/phpstan analyze

diff --git a/.github/workflows/update-config.yml b/.github/workflows/update-config.yml
@@ -24,6 +24,12 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - name: Check if required secrets are set
+        env:
+          AUTOMATIC_UPDATE_TOKEN: ${{ secrets.AUTOMATIC_UPDATE_TOKEN }}
+        if: env.AUTOMATIC_UPDATE_TOKEN == ''
+        run: exit 1
+
       - name: Download latest dump
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -77,6 +83,7 @@ jobs:
         uses: peter-evans/create-pull-request@v6
         with:
           commit-message: Update configuration
+          token: ${{ secrets.AUTOMATIC_UPDATE_TOKEN }}
           title: Automatic update
           labels: auto-update
           body: |

diff --git a/README.md b/README.md
@@ -255,6 +255,12 @@ KASKO has some additional fields on TPR units.
 Field categories is used to save the TPR unit categorization that is done based on the `ontologyword_ids`. Read more
 about it in the [TPR unit categorization section](#tpr-unit-categorization).
 
+### Announcements for user with role "comprehensive school editor"
+
+Comprehensive school editor (peruskoulun sisällöntuottaja) can create, edit, translate and delete their own announcements.
+They can also see all unpublished announcements.
+An form alter has been created for announcement node. It prevents comprehensive school editor from creating a site wide announcement.
+
 #### [DEPRECATED] High school front page (field_hs_front_page)
 
 Reference field where the upper secondary school (high school) front page used to be added. Appears to be unused and

diff --git a/composer.lock b/composer.lock
diff --git a/conf/cmi/core.base_field_override.node.landing_page.promote.yml b/conf/cmi/core.base_field_override.node.landing_page.promote.yml
@@ -5,7 +5,7 @@ dependencies:
   config:
     - node.type.landing_page
 _core:
-  default_config_hash: KZ4pDrGhkRiIo7Ee-E4HGZp7YPXKS_FLR0nLeUQ3P2U
+  default_config_hash: 0RFWx8vtIwLeQrOoawTp8idfhPTj_7aPejhw4Pp3xqc
 id: node.landing_page.promote
 field_name: promote
 entity_type: node

diff --git a/conf/cmi/core.base_field_override.node.landing_page.status.yml b/conf/cmi/core.base_field_override.node.landing_page.status.yml
@@ -5,7 +5,7 @@ dependencies:
   config:
     - node.type.landing_page
 _core:
-  default_config_hash: ewmZbuO4KgD36Ka7QA-8tJ9jktJH-jQbTNMrkHfuQRc
+  default_config_hash: LhhVx2le9fx915rM-xf5RApryzfsAY8X_odQehIJq9U
 id: node.landing_page.status
 field_name: status
 entity_type: node

diff --git a/conf/cmi/core.base_field_override.node.page.promote.yml b/conf/cmi/core.base_field_override.node.page.promote.yml
@@ -5,7 +5,7 @@ dependencies:
   config:
     - node.type.page
 _core:
-  default_config_hash: vdYkuvvyzCU3dFiOu7LULd-uZyENb_byNYidQVIZtXk
+  default_config_hash: Awr4_4hZMOAsXNK5ZxL4I1U5BCzGywFswcc9pteegIk
 id: node.page.promote
 field_name: promote
 entity_type: node

diff --git a/conf/cmi/core.base_field_override.node.page.status.yml b/conf/cmi/core.base_field_override.node.page.status.yml
@@ -5,7 +5,7 @@ dependencies:
   config:
     - node.type.page
 _core:
-  default_config_hash: 0m4p2SiQag8S_hCuiUZt-3xis3qrOuBXCwKH51hF5lo
+  default_config_hash: sq-TgFSE-Ft53bktUufBtJVHiqZboy0IFAc5JH0iLJ4
 id: node.page.status
 field_name: status
 entity_type: node

diff --git a/...i/core.base_field_override.paragraphs_library_item.paragraphs_library_item.paragraphs.yml b/...i/core.base_field_override.paragraphs_library_item.paragraphs_library_item.paragraphs.yml
@@ -8,7 +8,6 @@ dependencies:
     - paragraphs.paragraphs_type.columns
     - paragraphs.paragraphs_type.contact_card_listing
     - paragraphs.paragraphs_type.content_cards
-    - paragraphs.paragraphs_type.content_liftup
     - paragraphs.paragraphs_type.image
     - paragraphs.paragraphs_type.liftup_with_image
     - paragraphs.paragraphs_type.list_of_links
@@ -45,7 +44,6 @@ settings:
       columns: columns
       contact_card_listing: contact_card_listing
       content_cards: content_cards
-      content_liftup: content_liftup
       image: image
       liftup_with_image: liftup_with_image
       list_of_links: list_of_links
@@ -72,9 +70,6 @@ settings:
       content_cards:
         weight: 0
         enabled: true
-      content_liftup:
-        weight: 0
-        enabled: true
       image:
         weight: 0
         enabled: true

diff --git a/conf/cmi/core.entity_form_display.node.landing_page.default.yml b/conf/cmi/core.entity_form_display.node.landing_page.default.yml
@@ -18,7 +18,7 @@ dependencies:
     - publication_date
     - scheduler
 _core:
-  default_config_hash: hhHaoVWPiqGGQ2qDbN-7sawAmvK_BCGWA2vwgIevwq4
+  default_config_hash: nz2kuZQ53sXaRjzi5GT0LPTskHJFGOgRZuY2XwpDYls
 id: node.landing_page.default
 targetEntityType: node
 bundle: landing_page

diff --git a/conf/cmi/core.entity_form_display.node.page.default.yml b/conf/cmi/core.entity_form_display.node.page.default.yml
@@ -21,7 +21,7 @@ dependencies:
     - publication_date
     - scheduler
 _core:
-  default_config_hash: IrTthHmbnCZxuMpndzRlr9-t2RT3szU18RcM_bpnrz0
+  default_config_hash: 1c66UJvkqgUlwTKKPGactcR0FjaLLXJZq9ZHP_M24ao
 id: node.page.default
 targetEntityType: node
 bundle: page

diff --git a/conf/cmi/core.entity_form_display.paragraph.content_liftup.default.yml b/conf/cmi/core.entity_form_display.paragraph.content_liftup.default.yml
diff --git a/conf/cmi/core.entity_form_display.paragraph.curated_event_list.default.yml b/conf/cmi/core.entity_form_display.paragraph.curated_event_list.default.yml
@@ -0,0 +1,38 @@
+uuid: b5c5ed81-d651-4db2-8d72-a67e7b66390e
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.field.paragraph.curated_event_list.field_all_events_link
+    - field.field.paragraph.curated_event_list.field_events
+    - paragraphs.paragraphs_type.curated_event_list
+  module:
+    - link
+_core:
+  default_config_hash: xbLWsjGFnK8aSW5O_r3mVF5bAlCp8J6wP5mGihlXLfU
+id: paragraph.curated_event_list.default
+targetEntityType: paragraph
+bundle: curated_event_list
+mode: default
+content:
+  field_all_events_link:
+    type: link_default
+    weight: 1
+    region: content
+    settings:
+      placeholder_url: ''
+      placeholder_title: ''
+    third_party_settings: {  }
+  field_events:
+    type: entity_reference_autocomplete
+    weight: 0
+    region: content
+    settings:
+      match_operator: CONTAINS
+      match_limit: 5
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+hidden:
+  created: true
+  status: true
diff --git a/conf/cmi/core.entity_form_display.tpr_unit.tpr_unit.default.yml b/conf/cmi/core.entity_form_display.tpr_unit.tpr_unit.default.yml
@@ -133,6 +133,16 @@ content:
       allowed_formats:
         hide_help: '1'
         hide_guidelines: '1'
+  field_categories:
+    type: readonly_field_widget
+    weight: 39
+    region: content
+    settings:
+      label: above
+      formatter_type: null
+      formatter_settings: {  }
+      show_description: false
+    third_party_settings: {  }
   field_content:
     type: paragraphs
     weight: 31
@@ -152,6 +162,16 @@ content:
         collapse_edit_all: collapse_edit_all
         duplicate: duplicate
     third_party_settings: {  }
+  field_hs_front_page:
+    type: entity_reference_autocomplete
+    weight: 31
+    region: content
+    settings:
+      match_operator: CONTAINS
+      match_limit: 10
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
   field_lower_content:
     type: paragraphs
     weight: 33
@@ -179,6 +199,16 @@ content:
       sidebar: false
       use_details: true
     third_party_settings: {  }
+  field_ontologyword_details:
+    type: readonly_field_widget
+    weight: 40
+    region: content
+    settings:
+      label: above
+      formatter_type: null
+      formatter_settings: {  }
+      show_description: false
+    third_party_settings: {  }
   field_phone_label:
     type: string_textfield
     weight: 11
@@ -194,6 +224,16 @@ content:
     settings:
       display_label: true
     third_party_settings: {  }
+  field_study_field:
+    type: select2_entity_reference
+    weight: 31
+    region: content
+    settings:
+      width: 100%
+      autocomplete: false
+      match_operator: CONTAINS
+      match_limit: 10
+    third_party_settings: {  }
   field_unit_type:
     type: entity_reference_autocomplete
     weight: 34
@@ -204,6 +244,13 @@ content:
       size: 60
       placeholder: ''
     third_party_settings: {  }
+  hide_description:
+    type: boolean_checkbox
+    weight: 18
+    region: content
+    settings:
+      display_label: true
+    third_party_settings: {  }
   hide_sidebar_navigation:
     type: boolean_checkbox
     weight: 35
@@ -391,6 +438,16 @@ content:
       formatter_settings: {  }
       show_description: false
     third_party_settings: {  }
+  subgroup:
+    type: readonly_field_widget
+    weight: 40
+    region: content
+    settings:
+      label: above
+      formatter_type: null
+      formatter_settings: {  }
+      show_description: false
+    third_party_settings: {  }
   toc_enabled:
     type: boolean_checkbox
     weight: 3
@@ -439,63 +496,6 @@ content:
       formatter_settings: {  }
       show_description: false
     third_party_settings: {  }
-  field_categories:
-    type: readonly_field_widget
-    weight: 39
-    region: content
-    settings:
-      label: above
-      formatter_type: null
-      formatter_settings: {  }
-      show_description: false
-    third_party_settings: {  }
-  field_hs_front_page:
-    type: entity_reference_autocomplete
-    weight: 31
-    region: content
-    settings:
-      match_operator: CONTAINS
-      match_limit: 10
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  field_ontologyword_details:
-    type: readonly_field_widget
-    weight: 40
-    region: content
-    settings:
-      label: above
-      formatter_type: null
-      formatter_settings: {  }
-      show_description: false
-    third_party_settings: {  }
-  field_study_field:
-    type: select2_entity_reference
-    weight: 31
-    region: content
-    settings:
-      width: 100%
-      autocomplete: false
-      match_operator: CONTAINS
-      match_limit: 10
-    third_party_settings: {  }
-  hide_description:
-    type: boolean_checkbox
-    weight: 18
-    region: content
-    settings:
-      display_label: true
-    third_party_settings: {  }
-  subgroup:
-    type: readonly_field_widget
-    weight: 40
-    region: content
-    settings:
-      label: above
-      formatter_type: null
-      formatter_settings: {  }
-      show_description: false
-    third_party_settings: {  }
 hidden:
   created: true
   field_districts: true