Merge branch 'release/3.0.10'

dpc-sdp · Apr 3, 2023 · fbb9edc · fbb9edc
2 parents 304d078 + 11a15b7
commit fbb9edc
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,6 @@
 # To ignore OS temporary files use global .gitignore
 # https://help.github.com/articles/ignoring-files/#create-a-global-gitignore
-
+.idea
 /composer.lock
 /composer.build.json
 /composer.build.lock

diff --git a/composer.json b/composer.json
@@ -6,6 +6,7 @@
     "require": {
         "dpc-sdp/tide_core": "^3.1.12",
         "drupal/jsonapi_extras": "^3.8",
+        "drupal/jsonapi_menu_items": "^1.2",
         "drupal/schemata": "^1.0-alpha2"
     },
     "extra": {
@@ -17,6 +18,9 @@
             },
             "drupal/jsonapi_extras": {
               "Make max value of page[limit] configurable per entity/bundle - https://www.drupal.org/project/jsonapi_extras/issues/2884292#comment-14794882": "https://www.drupal.org/files/issues/2022-11-21/max_page_limit_configuration-2884292-33.patch"
+            },
+            "drupal/jsonapi_menu_items": {
+                "Allow filtering of response payload - https://www.drupal.org/project/jsonapi_menu_items/issues/3350524": "https://www.drupal.org/files/issues/2023-03-31/filter_fields.patch"
             }
         }
     },

diff --git a/tide_api.info.yml b/tide_api.info.yml
@@ -5,6 +5,7 @@ package: Tide
 core_version_requirement: ^8.9 || ^9
 dependencies:
   - drupal:jsonapi_extras (>=8.x-3.8)
+  - drupal:jsonapi_menu_items (^1.2)
   - drupal:schemata
   - drupal:schemata_json_schema
 config_devel:

diff --git a/tide_api.install b/tide_api.install
@@ -44,3 +44,12 @@ function tide_api_update_8001() {
   $jsonapi_settings->set('read_only', FALSE)
     ->save(TRUE);
 }
+
+/**
+ * Activate jsonapi_menu_items.
+ */
+function tide_api_update_8002() {
+  \Drupal::service('module_installer')->install([
+    'jsonapi_menu_items',
+  ], TRUE);
+}