Merge pull request #1558 from danskernesdigitalebibliotek/develop

Release 2024.37.0
danskernesdigitalebibliotek · Sep 10, 2024 · 739d9c1 · 739d9c1
2 parents ad31281 + 07b055f
commit 739d9c1
Show file tree

Hide file tree

Showing 9 changed files with 9,953 additions and 10,019 deletions.
diff --git a/composer.json b/composer.json
@@ -40,10 +40,10 @@
             "type": "package",
             "package": {
                 "name": "danskernesdigitalebibliotek/dpl-react",
-                "version": "2024.36.0",
+                "version": "2024.37.0",
                 "type": "drupal-library",
                 "dist": {
-                    "url": "https://github.com/danskernesdigitalebibliotek/dpl-react/releases/download/2024.36.0/dist-2024-36-0-980a9ceb8b46195dfe6633b6e66a1f0c4167f4ec.zip",
+                    "url": "https://github.com/danskernesdigitalebibliotek/dpl-react/releases/download/2024.37.0/dist-2024-37-0-f2db689d6703c683823d449e282f7f51809702f4.zip",
                     "type": "zip"
                 },
                 "require": {
@@ -56,9 +56,9 @@
             "package": {
                 "name": "danskernesdigitalebibliotek/dpl-design-system",
                 "type": "drupal-library",
-                "version": "2024.36.0",
+                "version": "2024.37.0",
                 "dist": {
-                    "url": "https://github.com/danskernesdigitalebibliotek/dpl-design-system/releases/download/2024.36.0/dist-2024-36-0-b82b94df2d6d6d798fa5c695a2622133b60cd16d.zip",
+                    "url": "https://github.com/danskernesdigitalebibliotek/dpl-design-system/releases/download/2024.37.0/dist-2024-37-0-d007a043185fe27649dc16ba7d4996eab9ee1caf.zip",
                     "type": "zip"
                 }
             }
@@ -90,8 +90,8 @@
         "composer/installers": "1.12.0",
         "cweagans/composer-patches": "1.7.3",
         "danskernesdigitalebibliotek/cms-api": "*",
-        "danskernesdigitalebibliotek/dpl-design-system": "2024.36.0",
-        "danskernesdigitalebibliotek/dpl-react": "2024.36.0",
+        "danskernesdigitalebibliotek/dpl-design-system": "2024.37.0",
+        "danskernesdigitalebibliotek/dpl-react": "2024.37.0",
         "danskernesdigitalebibliotek/fbs-client": "*",
         "dealerdirect/phpcodesniffer-composer-installer": "^1.0.0",
         "deoliveiralucas/array-keys-case-transform": "^1.1",
@@ -191,6 +191,7 @@
         "php-mock/php-mock": "^2.3",
         "phpspec/prophecy-phpunit": "^2",
         "phpstan/extension-installer": "^1.3",
+        "phpstan/phpstan": "~1.11.11",
         "phpstan/phpstan-phpunit": "^1.3",
         "phpunit/phpunit": "9.5.10",
         "thecodingmachine/phpstan-safe-rule": "^1.0",

diff --git a/composer.lock b/composer.lock
diff --git a/config/sync/block.block.novel_views_block__events_related.yml b/config/sync/block.block.novel_views_block__events_related.yml
diff --git a/config/sync/views.view.event_series_admin.yml b/config/sync/views.view.event_series_admin.yml
@@ -475,7 +475,7 @@ display:
         type: basic
         options:
           submit_button: Apply
-          reset_button: false
+          reset_button: true
           reset_button_label: Reset
           exposed_sorts_label: 'Sort by'
           expose_sort_order: true

diff --git a/config/sync/views.view.events.yml b/config/sync/views.view.events.yml
@@ -310,38 +310,3 @@ display:
       tags:
         - 'config:search_api.index.events'
         - 'search_api_list:events'
-  related:
-    id: related
-    display_title: 'Related events'
-    display_plugin: block
-    position: 1
-    display_options:
-      title: ''
-      pager:
-        type: none
-        options:
-          offset: 0
-      style:
-        type: default
-        options: {  }
-      row:
-        type: search_api
-        options:
-          view_modes:
-            'entity:node':
-              event: card
-      defaults:
-        title: false
-        pager: false
-        style: false
-        row: false
-      display_description: ''
-      display_extenders: {  }
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_interface'
-        - user.permissions
-      tags:
-        - 'config:search_api.index.events'
-        - 'search_api_list:events'
diff --git a/package.json b/package.json
@@ -10,8 +10,8 @@
     "@typescript-eslint/eslint-plugin": "^7.18.0",
     "@typescript-eslint/parser": "^7.18.0",
     "chrome-launcher": "^0.15.1",
-    "cypress": "^13.14.1",
-    "cypress-if": "^1.12.5",
+    "cypress": "^13.14.2",
+    "cypress-if": "^1.12.6",
     "cypress-plugin-api": "^2.11.2",
     "dayjs": "^1.11.13",
     "eslint": "^8.57.0",

diff --git a/web/modules/custom/dpl_search/dpl_search.module b/web/modules/custom/dpl_search/dpl_search.module
@@ -89,8 +89,8 @@ function dpl_search_preprocess_views_view(array &$variables): void {
     $material_url = Url::fromRoute('dpl_react_apps.search_result', [], ['query' => [DplSearchSettings::MATERIAL_QUERY_KEY => $search_input]])->toString();
 
     $variables['header']['description'] = [
-      '#prefix' => '<h2 class="content-list-page__subheading">Switch to results for the <a href="' . $material_url . '">',
-      '#suffix' => '</h2></a>',
+      '#prefix' => '<h2 class="content-list-page__subheading">' . t('Switch to results for the', [], ['context' => 'dpl_search']) . ' <a href="' . $material_url . '">',
+      '#suffix' => '</a></h2>',
       '#markup' => t('library materials.', [], ['context' => 'dpl_search']),
     ];