Merge pull request #464 from City-of-Helsinki/update-configuration

Automatic update
City-of-Helsinki · Oct 25, 2023 · f5d662f · f5d662f
2 parents 954707c + 9c6bc32
commit f5d662f
Show file tree

Hide file tree

Showing 9 changed files with 385 additions and 47 deletions.
diff --git a/.platform/schema b/.platform/schema
@@ -1 +1 @@
-2
+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_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,6 +114,7 @@ hidden:
   services: true
   show_www: true
   streetview_entrance_url: true
+  toc_enabled: true
   topical: true
   unit_picture_caption: true
   www: true
diff --git a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.high_school_card.yml b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.high_school_card.yml
@@ -231,5 +231,6 @@ hidden:
   search_api_excerpt: true
   show_www: true
   streetview_entrance_url: true
+  toc_enabled: true
   topical: true
   unit_picture_caption: true
diff --git a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.vocational_school_card.yml b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.vocational_school_card.yml
@@ -225,5 +225,6 @@ hidden:
   search_api_excerpt: true
   show_www: true
   streetview_entrance_url: true
+  toc_enabled: true
   topical: true
   unit_picture_caption: true
diff --git a/conf/cmi/user.role.admin.yml b/conf/cmi/user.role.admin.yml
@@ -81,7 +81,6 @@ permissions:
   - 'administer eu cookie compliance popup'
   - 'administer group'
   - 'administer group content menu types'
-  - 'administer hotjar settings'
   - 'administer menu'
   - 'administer nodes'
   - 'administer paragraphs library'
@@ -225,8 +224,6 @@ permissions:
   - 'update own tpr_ontology_word_details'
   - 'update own tpr_service'
   - 'update own tpr_unit'
-  - 'update tpr_service'
-  - 'update tpr_unit'
   - 'use menu link attributes'
   - 'use text format full_html'
   - 'use text format minimal'

diff --git a/conf/cmi/views.view.service_list.yml b/conf/cmi/views.view.service_list.yml
@@ -360,13 +360,13 @@ display:
     display_plugin: block
     position: 1
     display_options:
-      display_extenders: {  }
       pager:
         type: none
         options:
           offset: 0
       defaults:
         pager: false
+      display_extenders: {  }
     cache_metadata:
       max-age: -1
       contexts:

diff --git a/public/modules/custom/helfi_group/helfi_group.module b/public/modules/custom/helfi_group/helfi_group.module
@@ -202,8 +202,11 @@ function helfi_group_form_node_form_alter(
 
   if ($form['menu']) {
     $menu_parent = $form['menu']['link']['menu_parent']['#default_value'];
-    $menu_name = explode(':', $menu_parent)[0];
+    if (!$menu_parent) {
+      return;
+    }
 
+    $menu_name = explode(':', $menu_parent)[0];
     if (!str_contains($menu_name, 'group')) {
       return;
     }
@@ -235,7 +238,7 @@ function helfi_group_form_node_form_alter(
     $menu_link_content = $menu_link_content->getTranslation($current_language);
     $status = $menu_link_content->get('content_translation_status')->value;
     $form['menu']['content_translation_status']['#default_value'] = $status;
-    $form["menu"]["content_translation_status"]["#description"] = t('Tämä arvo muuttuu automaattisesti tallentaessa sisällön julkaisutilan mukaan.');
+    $form['menu']['content_translation_status']['#description'] = 'Tämä arvo muuttuu automaattisesti tallentaessa sisällön julkaisutilan mukaan.';
   }
 
 }
@@ -255,7 +258,11 @@ function helfi_group_menuitem_set_content_translation_status(
   FormStateInterface $form_state
 ) : void {
   $menu_parent = $form['menu']['link']['menu_parent']['#default_value'];
+  if (!$menu_parent) {
+    return;
+  }
   $menu_name = explode(':', $menu_parent)[0];
+
   $values = $form_state->getValue('menu');
   $node = $form_state->getFormObject()->getEntity();
   $langCode = $node->language()->getId();