Merge pull request #1802 from danskernesdigitalebibliotek/develop

Release 2024.48.0
danskernesdigitalebibliotek · Nov 26, 2024 · 9413824 · 9413824
2 parents 9dab45a + d4c15ff
commit 9413824
Show file tree

Hide file tree

Showing 217 changed files with 3,080 additions and 1,503 deletions.
diff --git a/.env.example b/.env.example
@@ -1,5 +1,9 @@
 COMPOSE_PROJECT_NAME=dpl-cms
 COMPOSER_MEMORY_LIMIT=-1
+
+# GraphQL Consumer environment variables used for local development
+GRAPHQL_CONSUMER_SECRET=some-secret
+
 #OPENID_CLIENT_ID=some-client-id
 #OPENID_CLIENT_SECRET=some-client-secret
 #OPENID_AGENCY_ID=some-agency-id
diff --git a/.prettierrc.json b/.prettierrc.json
@@ -0,0 +1,16 @@
+{
+  "printWidth": 80,
+  "semi": true,
+  "singleQuote": true,
+  "trailingComma": "all",
+  "overrides": [
+    {
+      "files": ["*.css"],
+      "options": {
+        "parser": "css",
+        "printWidth": 10000,
+        "singleQuote": false
+      }
+    }
+  ]
+}
diff --git a/Taskfile.yml b/Taskfile.yml
@@ -86,8 +86,10 @@ tasks:
   dev:build:
     summary: Build docker containers
     # Ensure that we only rebuild if there are changes to Dockerfiles
+    # or the config files used.
     sources:
-      - "{{ .LAGOON_DIR }}/*.dockerfile"
+      - "{{ .LAGOON_DIR }}/**/*"
+      - "{{ .LAGOON_DIR }}/*"
     cmds:
       - docker compose build
 
@@ -382,6 +384,16 @@ tasks:
     cmds:
       - cmd: task dev:cli -- drush default-content:export-module dpl_example_content
 
+  dev:go:set-graphql-secret:
+    desc: Sets the GraphQL consumer secret based on the .env variable.
+    cmds:
+      - cmd: task dev:cli -- drush dpl_consumers:set-consumer-secret
+
+  dev:go:graphql-credentials:
+    desc: Get the GraphQL consumer credentials
+    cmds:
+      - cmd: task dev:cli -- drush dpl_consumers:consumer-credentials
+
   ci:reset:
     desc: Create CI setup in a clean state
     cmds:

diff --git a/assets/all.settings.php b/assets/all.settings.php
@@ -56,6 +56,21 @@
 // advanced security measure: '../config/sync'.
 $settings['config_sync_directory'] = '../config/sync';
 
+/**
+ * Private file path.
+ *
+ * A local file system path where private files will be stored. This directory
+ * must be absolute, outside the Drupal installation directory and not
+ * accessible over the web.
+ *
+ * Note: Caches need to be cleared when this value is changed to make the
+ * private:// stream wrapper available to the system.
+ *
+ * See https://www.drupal.org/documentation/modules/file for more information
+ * about securing private files.
+ */
+$settings['file_private_path'] = $app_root . '/sites/default/files/private';
+
 // Set service base urls for the react apps.
 $config['dpl_react_apps.settings']['services'] = [
   'cover' => ['base_url' => 'https://cover.dandigbib.org'],

diff --git a/composer.json b/composer.json
@@ -40,10 +40,10 @@
             "type": "package",
             "package": {
                 "name": "danskernesdigitalebibliotek/dpl-react",
-                "version": "2024.47.0",
+                "version": "2024.48.0",
                 "type": "drupal-library",
                 "dist": {
-                    "url": "https://github.com/danskernesdigitalebibliotek/dpl-react/releases/download/2024.47.0/dist-2024-47-0-d262e234fe972eeb86cc0e21d663245a3a96331a.zip",
+                    "url": "https://github.com/danskernesdigitalebibliotek/dpl-react/releases/download/2024.48.0/dist-2024-48-0-6f62c8848cc77c7b83fa3c2591ec0dd2e345a2d3.zip",
                     "type": "zip"
                 },
                 "require": {
@@ -56,9 +56,9 @@
             "package": {
                 "name": "danskernesdigitalebibliotek/dpl-design-system",
                 "type": "drupal-library",
-                "version": "2024.47.1",
+                "version": "2024.48.0",
                 "dist": {
-                    "url": "https://github.com/danskernesdigitalebibliotek/dpl-design-system/releases/download/2024.47.1/dist-2024-47-1-acd61eab1fefee5ed1bc3da76b31c9640caa8671.zip",
+                    "url": "https://github.com/danskernesdigitalebibliotek/dpl-design-system/releases/download/2024.48.0/dist-2024-48-0-41958fd47476e2ba316c4529ce2f0ae3e31dd1e4.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.47.1",
-        "danskernesdigitalebibliotek/dpl-react": "2024.47.0",
+        "danskernesdigitalebibliotek/dpl-design-system": "2024.48.0",
+        "danskernesdigitalebibliotek/dpl-react": "2024.48.0",
         "danskernesdigitalebibliotek/fbs-client": "*",
         "dealerdirect/phpcodesniffer-composer-installer": "^1.0.0",
         "deoliveiralucas/array-keys-case-transform": "^1.1",
@@ -110,9 +110,9 @@
         "drupal/consumers": "^1.19",
         "drupal/content_lock": "^2.3",
         "drupal/cookieinformation": "^2.1",
-        "drupal/core-composer-scaffold": "10.3.9",
-        "drupal/core-project-message": "10.3.9",
-        "drupal/core-recommended": "10.3.9",
+        "drupal/core-composer-scaffold": "10.3.10",
+        "drupal/core-project-message": "10.3.10",
+        "drupal/core-recommended": "10.3.10",
         "drupal/date_range_formatter": "^4.0",
         "drupal/default_content": "^2.0@alpha",
         "drupal/devel": "^5.1",
@@ -164,6 +164,7 @@
         "drupal/select2_multicheck": "^1.0",
         "drupal/selective_better_exposed_filters": "^3.0",
         "drupal/simple_menu_permissions": "^2.0",
+        "drupal/simple_oauth": "^5.2",
         "drupal/taxonomy_unique": "^2.5",
         "drupal/telephone_formatter": "^1.2",
         "drupal/theme_permission": "^2.0",
@@ -224,8 +225,8 @@
     },
     "scripts": {
         "post-drupal-scaffold-cmd": [
-            "[[ ! -d /app/web/sites/default/files/modules_local ]] && mkdir -p /app/web/sites/default/files/modules_local || exit 0",
-            "[[ ! -L /app/web/modules/local ]] && ln -s /app/web/sites/default/files/modules_local /app/web/modules/local || exit 0"
+            "[ ! -d web/sites/default/files/modules_local ] && mkdir -p web/sites/default/files/modules_local || exit 0",
+            "[ ! -L web/modules/local ] && ln -s web/sites/default/files/modules_local web/modules/local || exit 0"
         ]
     },
     "extra": {
@@ -297,10 +298,10 @@
                 "Add item count and url page parameter": "patches/add-item-count-views_infinite_scroll.patch"
             },
             "drupal/core": {
-                "Configure core to not check permissions before accepting an updated module": "patches/disable-core-upload-permission-check.diff",
                 "2280639: Add the FieldStorageDefinition class to define field storage definitions in hook_entity_field_storage_info()": "https://www.drupal.org/files/issues/2023-09-05/2280639-d10-reroll-156.patch",
                 "3402656: Toolbar causes a Javascript error if the subtrees content changes between page loads": "https://git.drupalcode.org/issue/drupal-3402656/-/commit/61ac007a84014f54a07825f8f92bb6bc0dfbd170.patch",
                 "3035578: Add details for AJAX response errors": "https://www.drupal.org/files/issues/2023-07-24/3035578-26.patch",
+                "3293926: Error decorating non-existent service when inner service's module not installed": "https://git.drupalcode.org/project/drupal/-/commit/a64662a3cea209c106b888ce9ef03cc1808f9ffe.patch",
                 "Always assume chmod succeeds": "patches/core-chmod-true.patch",
                 "Debug Form triggering element detection": "patches/form-triggering-element-detection-paragraphs-ee.patch"
             },
@@ -339,6 +340,9 @@
             "drupal/jsonlog": {
                 "3251587: Change logging from stdout to stderr": "https://www.drupal.org/files/issues/2021-11-29/jsonlog-change-stdout-to-stderr-3251587-3.patch"
             },
+            "drupal/openapi": {
+                "3480050: Update oauth2 security definitions to match openapi v2 specification": "https://www.drupal.org/files/issues/2024-10-11/openapi-add-oauth2-accesscode-flow-3480050-3.patch"
+            },
             "drupal/openapi_rest": {
                 "3171530 + 3116760: Add support for parameter and response descriptions": "patches/openapi-parameter-response-descriptions-14-3.patch",
                 "3343816: Specification includes disabled resources": "https://git.drupalcode.org/project/openapi_rest/-/commit/6618157334feca93fad1041583375eed660b9085.patch"