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

Dev to main
City-of-Helsinki · Oct 25, 2023 · 59424b2 · 59424b2
2 parents 04f32b4 + f5d662f
commit 59424b2
Show file tree

Hide file tree

Showing 23 changed files with 890 additions and 202 deletions.
diff --git a/.platform/schema b/.platform/schema
@@ -0,0 +1 @@
+3
diff --git a/composer.json b/composer.json
@@ -34,7 +34,12 @@
         "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
         "drupal/coder": "^8.3",
         "drupal/core-dev": "^9.1",
+        "jangregor/phpstan-prophecy": "^1.0",
+        "mglaman/phpstan-drupal": "^1.2",
         "phpspec/prophecy-phpunit": "^2",
+        "phpstan/extension-installer": "^1.3",
+        "phpstan/phpstan": "^1.10",
+        "phpstan/phpstan-deprecation-rules": "^1.1",
         "phpunit/phpunit": "^9.6",
         "weitzman/drupal-test-traits": "^2.1"
     },
@@ -49,7 +54,8 @@
             "composer/installers": true,
             "cweagans/composer-patches": true,
             "drupal/core-composer-scaffold": true,
-            "php-http/discovery": false
+            "php-http/discovery": false,
+            "phpstan/extension-installer": true
         },
         "audit": {
             "abandoned": "report"

diff --git a/composer.lock b/composer.lock
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
@@ -20,15 +20,15 @@ dependencies:
     - path
     - readonly_field_widget
 _core:
-  default_config_hash: RcjlFBYhitNunsd4AVtO6f3l-efOfSCW_nlNFMznzhk
+  default_config_hash: C2Xc2BwYmiIL9SayNQLxaufcoqA5SLusFthQgnmb10A
 id: tpr_unit.tpr_unit.default
 targetEntityType: tpr_unit
 bundle: tpr_unit
 mode: default
 content:
   accessibility_email:
     type: readonly_field_widget
-    weight: 9
+    weight: 12
     region: content
     settings:
       label: above
@@ -38,7 +38,7 @@ content:
     third_party_settings: {  }
   accessibility_phone:
     type: readonly_field_widget
-    weight: 8
+    weight: 11
     region: content
     settings:
       label: above
@@ -48,7 +48,7 @@ content:
     third_party_settings: {  }
   accessibility_www:
     type: readonly_field_widget
-    weight: 12
+    weight: 17
     region: content
     settings:
       label: above
@@ -58,7 +58,7 @@ content:
     third_party_settings: {  }
   address:
     type: readonly_field_widget
-    weight: 14
+    weight: 19
     region: content
     settings:
       label: above
@@ -68,7 +68,7 @@ content:
     third_party_settings: {  }
   address_postal:
     type: readonly_field_widget
-    weight: 16
+    weight: 21
     region: content
     settings:
       label: above
@@ -78,7 +78,7 @@ content:
     third_party_settings: {  }
   call_charge_info:
     type: readonly_field_widget
-    weight: 15
+    weight: 20
     region: content
     settings:
       label: above
@@ -88,8 +88,8 @@ content:
     third_party_settings: {  }
   contacts:
     type: readonly_field_widget
+    weight: 39
     region: content
-    weight: 36
     settings:
       label: above
       formatter_type: null
@@ -98,7 +98,7 @@ content:
     third_party_settings: {  }
   description:
     type: readonly_field_widget
-    weight: 13
+    weight: 18
     region: content
     settings:
       label: above
@@ -108,7 +108,7 @@ content:
     third_party_settings: {  }
   email:
     type: readonly_field_widget
-    weight: 7
+    weight: 10
     region: content
     settings:
       label: above
@@ -118,7 +118,7 @@ content:
     third_party_settings: {  }
   field_content:
     type: paragraphs
-    weight: 27
+    weight: 28
     region: content
     settings:
       title: Paragraph
@@ -137,7 +137,7 @@ content:
     third_party_settings: {  }
   field_lower_content:
     type: paragraphs
-    weight: 28
+    weight: 29
     region: content
     settings:
       title: Paragraph
@@ -156,14 +156,15 @@ content:
     third_party_settings: {  }
   field_metatags:
     type: metatag_firehose
-    weight: 26
+    weight: 27
     region: content
     settings:
       sidebar: false
+      use_details: true
     third_party_settings: {  }
   field_unit_type:
     type: entity_reference_autocomplete
-    weight: 28
+    weight: 30
     region: content
     settings:
       match_operator: CONTAINS
@@ -173,15 +174,15 @@ content:
     third_party_settings: {  }
   hide_sidebar_navigation:
     type: boolean_checkbox
-    weight: 29
+    weight: 31
     region: content
     settings:
       display_label: true
     third_party_settings: {  }
   highlights:
     type: readonly_field_widget
+    weight: 36
     region: content
-    weight: 33
     settings:
       label: above
       formatter_type: null
@@ -197,7 +198,7 @@ content:
     third_party_settings: {  }
   latitude:
     type: readonly_field_widget
-    weight: 17
+    weight: 22
     region: content
     settings:
       label: above
@@ -207,8 +208,8 @@ content:
     third_party_settings: {  }
   links:
     type: readonly_field_widget
+    weight: 33
     region: content
-    weight: 31
     settings:
       label: above
       formatter_type: null
@@ -217,7 +218,7 @@ content:
     third_party_settings: {  }
   longitude:
     type: readonly_field_widget
-    weight: 18
+    weight: 23
     region: content
     settings:
       label: above
@@ -245,8 +246,8 @@ content:
     third_party_settings: {  }
   opening_hours:
     type: readonly_field_widget
+    weight: 35
     region: content
-    weight: 32
     settings:
       label: above
       formatter_type: null
@@ -255,8 +256,8 @@ content:
     third_party_settings: {  }
   other_info:
     type: readonly_field_widget
+    weight: 37
     region: content
-    weight: 34
     settings:
       label: above
       formatter_type: null
@@ -265,13 +266,13 @@ content:
     third_party_settings: {  }
   path:
     type: path
-    weight: 11
+    weight: 16
     region: content
     settings: {  }
     third_party_settings: {  }
   phone:
     type: readonly_field_widget
-    weight: 6
+    weight: 9
     region: content
     settings:
       label: above
@@ -281,7 +282,7 @@ content:
     third_party_settings: {  }
   picture_url:
     type: readonly_field_widget
-    weight: 3
+    weight: 5
     region: content
     settings:
       label: above
@@ -291,15 +292,15 @@ content:
     third_party_settings: {  }
   picture_url_override:
     type: media_library_widget
-    weight: 4
+    weight: 6
     region: content
     settings:
       media_types: {  }
     third_party_settings: {  }
   price_info:
     type: readonly_field_widget
+    weight: 38
     region: content
-    weight: 35
     settings:
       label: above
       formatter_type: null
@@ -308,7 +309,7 @@ content:
     third_party_settings: {  }
   provided_languages:
     type: readonly_field_widget
-    weight: 30
+    weight: 32
     region: content
     settings:
       label: above
@@ -318,7 +319,7 @@ content:
     third_party_settings: {  }
   service_map_embed:
     type: readonly_field_widget
-    weight: 20
+    weight: 25
     region: content
     settings:
       label: above
@@ -328,7 +329,7 @@ content:
     third_party_settings: {  }
   services:
     type: readonly_field_widget
-    weight: 21
+    weight: 26
     region: content
     settings:
       label: above
@@ -338,19 +339,44 @@ content:
     third_party_settings: {  }
   show_www:
     type: boolean_checkbox
-    weight: 11
+    weight: 15
     region: content
     settings:
       display_label: true
     third_party_settings: {  }
   simple_sitemap:
-    weight: 10
+    weight: 14
     region: content
     settings: {  }
     third_party_settings: {  }
   streetview_entrance_url:
     type: readonly_field_widget
-    weight: 19
+    weight: 24
+    region: content
+    settings:
+      label: above
+      formatter_type: null
+      formatter_settings: {  }
+      show_description: false
+    third_party_settings: {  }
+  toc_enabled:
+    type: boolean_checkbox
+    weight: 3
+    region: content
+    settings:
+      display_label: true
+    third_party_settings: {  }
+  toc_title:
+    type: string_textfield
+    weight: 4
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  topical:
+    type: readonly_field_widget
+    weight: 34
     region: content
     settings:
       label: above
@@ -359,21 +385,21 @@ content:
       show_description: false
     third_party_settings: {  }
   translation:
-    weight: 5
+    weight: 8
     region: content
     settings: {  }
     third_party_settings: {  }
   unit_picture_caption:
     type: string_textarea
-    weight: 5
+    weight: 7
     region: content
     settings:
       rows: 5
       placeholder: ''
     third_party_settings: {  }
   www:
     type: readonly_field_widget
-    weight: 10
+    weight: 13
     region: content
     settings:
       label: above

diff --git a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.comprehensive_school_card.yml b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.comprehensive_school_card.yml
@@ -114,4 +114,7 @@ hidden:
   services: true
   show_www: true
   streetview_entrance_url: true
+  toc_enabled: true
+  topical: true
+  unit_picture_caption: true
   www: true