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

Dev to main

composer.json

@@ -9,13 +9,13 @@
     "require": {
         "composer/installers": "^2.0",
         "cweagans/composer-patches": "^1.6.7",
+        "drupal/core": "^9.4",
         "drupal/core-composer-scaffold": "^9.4",
-        "drupal/core-recommended": "^9.4",
         "drupal/hdbt": "^4.0",
         "drupal/hdbt_admin": "^1.0",
-        "drupal/helfi_azure_fs": "^1.0",
+        "drupal/helfi_azure_fs": "^1.1",
         "drupal/helfi_drupal_tools": "dev-main",
-        "drupal/helfi_navigation": "^1.0",
+        "drupal/helfi_navigation": "^2.0",
         "drupal/helfi_platform_config": "^2.0",
         "drupal/helfi_proxy": "^3.0",
         "drupal/helfi_tpr": "^2.0",
@@ -36,7 +36,7 @@
         "phpstan/phpstan": "^1.0",
         "phpstan/phpstan-deprecation-rules": "^1.0",
         "phpunit/phpunit": "^9.5",
-        "weitzman/drupal-test-traits": "^1.5"
+        "weitzman/drupal-test-traits": "^2.0"
     },
     "conflict": {
         "drupal/drupal": "*"

conf/cmi/core.extension.yml

@@ -76,7 +76,6 @@ module:
   locale: 0
   media: 0
   media_entity_file_replace: 0
-  media_entity_soundcloud: 0
   media_library: 0
   menu_block_current_language: 0
   menu_link_attributes: 0

conf/cmi/oembed_providers.provider.icareus_suite.yml

@@ -41,3 +41,12 @@ endpoints:
     formats:
       json: true
       xml: false
+  -
+    schemes:
+      - 'https://www.helsinkikanava.fi/*/web/helsinkikanava/player/embed/vod?assetId=*'
+      - 'https://helsinkikanava.fi/*/web/helsinkikanava/player/embed/vod?assetId=*'
+    url: 'https://suite.icareus.com/api/oembed'
+    discovery: false
+    formats:
+      json: true
+      xml: false

conf/cmi/rest.resource.helfi_global_mobile_menu.yml

@@ -0,0 +1,18 @@
+uuid: 251e36bc-9fa3-494d-80d2-9e99efa40c4c
+langcode: en
+status: true
+dependencies:
+  module:
+    - helfi_navigation
+    - serialization
+    - user
+id: helfi_global_mobile_menu
+plugin_id: helfi_global_mobile_menu
+granularity: resource
+configuration:
+  methods:
+    - GET
+  formats:
+    - json
+  authentication:
+    - cookie

conf/cmi/user.role.admin.yml

@@ -10,7 +10,6 @@ dependencies:
     - media.type.helfi_chart
     - media.type.image
     - media.type.remote_video
-    - media.type.soundcloud
     - node.type.announcement
     - node.type.landing_page
     - node.type.page
@@ -96,7 +95,6 @@ permissions:
   - 'create paragraph library item'
   - 'create remote entities'
   - 'create remote_video media'
-  - 'create soundcloud media'
   - 'create terms in keywords'
   - 'create url aliases'
   - 'delete all revisions'
@@ -110,7 +108,6 @@ permissions:
   - 'delete any media'
   - 'delete any page content'
   - 'delete any remote_video media'
-  - 'delete any soundcloud media'
   - 'delete content translations'
   - 'delete landing_page revisions'
   - 'delete media'
@@ -122,7 +119,6 @@ permissions:
   - 'delete own landing_page content'
   - 'delete own page content'
   - 'delete own remote_video media'
-  - 'delete own soundcloud media'
   - 'delete page revisions'
   - 'delete remote entities'
   - 'delete terms in keywords'
@@ -134,7 +130,6 @@ permissions:
   - 'edit any landing_page content'
   - 'edit any page content'
   - 'edit any remote_video media'
-  - 'edit any soundcloud media'
   - 'edit own announcement content'
   - 'edit own file media'
   - 'edit own hel_map media'
@@ -143,7 +138,6 @@ permissions:
   - 'edit own landing_page content'
   - 'edit own page content'
   - 'edit own remote_video media'
-  - 'edit own soundcloud media'
   - 'edit paragraph library item'
   - 'edit remote entities'
   - 'edit terms in keywords'
@@ -169,7 +163,6 @@ permissions:
   - 'translate menu_link_content'
   - 'translate page node'
   - 'translate remote_video media'
-  - 'translate soundcloud media'
   - 'translate tpr_errand_service'
   - 'translate tpr_service'
   - 'translate tpr_service_channel'

conf/cmi/user.role.anonymous.yml

@@ -8,6 +8,9 @@ dependencies:
     - helfi_tpr
     - media
     - system
+    - rest
+  config:
+    - rest.resource.helfi_global_mobile_menu
 _core:
   default_config_hash: j5zLMOdJBqC0bMvSdth5UebkprJB8g_2FXHqhfpJzow
 id: anonymous
@@ -21,3 +24,4 @@ permissions:
   - 'view remote entities'
   - 'view tpr_service'
   - 'view tpr_unit'
+  - 'restful get helfi_global_mobile_menu'

conf/cmi/user.role.authenticated.yml

@@ -9,6 +9,9 @@ dependencies:
     - media
     - system
     - toolbar
+    - rest
+  config:
+    - rest.resource.helfi_global_mobile_menu
 _core:
   default_config_hash: dJ0L2DNSj5q6XVZAGsuVDpJTh5UeYkIPwKrUOOpr8YI
 id: authenticated
@@ -23,3 +26,4 @@ permissions:
   - 'view remote entities'
   - 'view tpr_service'
   - 'view tpr_unit'
+  - 'restful get helfi_global_mobile_menu'