Merge pull request #1824 from danskernesdigitalebibliotek/develop

Release 2024.49.0

.env.example

@@ -1,4 +1,4 @@
-COMPOSE_PROJECT_NAME=dpl-cms
+COMPOSE_PROJECT_NAME=dapple-cms
 COMPOSER_MEMORY_LIMIT=-1
 
 # GraphQL Consumer environment variables used for local development

Taskfile.yml

@@ -34,6 +34,8 @@ vars:
   DOCKER_COMPOSE_FILES_DEFAULT: "-f docker-compose.yml"
   DOCKER_COMPOSE_FILES: "{{.DOCKER_COMPOSE_FILES | default .DOCKER_COMPOSE_FILES_DEFAULT }}"
   DOCKER_COMPOSE_FILES_CI: "{{.DOCKER_COMPOSE_FILES}} -f docker-compose.ci.yml"
+  DOCKER_COMPOSE_FILES_DEV: "{{.DOCKER_COMPOSE_FILES}} -f docker-compose.dev.yml"
+
   # Sql dump files directory
   DIR_RESTORE_DATABASE: "restore/database"
   # Directory with lagoon backup files.
@@ -176,6 +178,8 @@ tasks:
       - task dev:create-users
       # Show a one-time login to the local site.
       - task dev:cli -- drush user-login
+    env:
+      DOCKER_COMPOSE_FILES: "{{ .DOCKER_COMPOSE_FILES_DEV }}"
 
   dev:openid:configure:
     desc: Set openid connect settings based on .env variables. And run cron.

assets/local.services.yml

@@ -2,6 +2,21 @@ parameters:
   twig.config:
     debug: true
   http.response.debug_cacheability_headers: true
+  cors.config:
+    enabled: true
+    # Specify allowed headers, like 'x-allowed-header'.
+    allowedHeaders: ['*']
+    # Specify allowed request methods, specify ['*'] to allow all possible ones.
+    allowedMethods: ['*']
+    # Configure requests allowed from specific origins.
+    allowedOrigins: ['*']
+    # Sets the Access-Control-Expose-Headers header.
+    exposedHeaders: false
+    # Sets the Access-Control-Max-Age header.
+    maxAge: false
+    # Sets the Access-Control-Allow-Credentials header.
+    supportsCredentials: false
+
 services:
   cache.backend.null:
     class: Drupal\Core\Cache\NullBackendFactory

composer.json

@@ -40,10 +40,10 @@
             "type": "package",
             "package": {
                 "name": "danskernesdigitalebibliotek/dpl-react",
-                "version": "2024.48.0",
+                "version": "2024.49.0",
                 "type": "drupal-library",
                 "dist": {
-                    "url": "https://github.com/danskernesdigitalebibliotek/dpl-react/releases/download/2024.48.0/dist-2024-48-0-6f62c8848cc77c7b83fa3c2591ec0dd2e345a2d3.zip",
+                    "url": "https://github.com/danskernesdigitalebibliotek/dpl-react/releases/download/2024.49.0/dist-2024-49-0-ccdcf6397ae7b1acd328c0cdd5688c2d7bbf1bd4.zip",
                     "type": "zip"
                 },
                 "require": {
@@ -56,9 +56,9 @@
             "package": {
                 "name": "danskernesdigitalebibliotek/dpl-design-system",
                 "type": "drupal-library",
-                "version": "2024.48.0",
+                "version": "2024.49.0",
                 "dist": {
-                    "url": "https://github.com/danskernesdigitalebibliotek/dpl-design-system/releases/download/2024.48.0/dist-2024-48-0-41958fd47476e2ba316c4529ce2f0ae3e31dd1e4.zip",
+                    "url": "https://github.com/danskernesdigitalebibliotek/dpl-design-system/releases/download/2024.49.0/dist-2024-49-0-6c2891c7ad8ebebab5a41646dc217693f0b49284.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.48.0",
-        "danskernesdigitalebibliotek/dpl-react": "2024.48.0",
+        "danskernesdigitalebibliotek/dpl-design-system": "2024.49.0",
+        "danskernesdigitalebibliotek/dpl-react": "2024.49.0",
         "danskernesdigitalebibliotek/fbs-client": "*",
         "dealerdirect/phpcodesniffer-composer-installer": "^1.0.0",
         "deoliveiralucas/array-keys-case-transform": "^1.1",
@@ -102,7 +102,6 @@
         "drupal/antibot": "^2.0",
         "drupal/azure_mailer": "^2.0",
         "drupal/color_field": "^3.0",
-        "drupal/config_filter": "^2.6",
         "drupal/config_ignore": "^3",
         "drupal/config_ignore_auto": "^3",
         "drupal/config_perms": "^2.1",

config/sync/core.extension.yml

@@ -50,6 +50,7 @@ module:
   dpl_library_token: 0
   dpl_link: 0
   dpl_loans: 0
+  dpl_logging: 0
   dpl_login: 0
   dpl_mail: 0
   dpl_mapp: 0

docker-compose.dev.yml

@@ -0,0 +1,22 @@
+---
+services:
+  https:
+    image: ghcr.io/reload/https-proxy:proxy
+    ports:
+      - '80'
+      - '443'
+    depends_on:
+      - varnish
+    volumes:
+      - 'projectroot:/app'
+      - '${HOME}/.local/share/mkcert:/rootCA:ro'
+      - '${HOME}/.local/share/dev_certificates:/cert:rw'
+    environment:
+      NGINX_DOCUMENT_ROOT: /app/web
+      NGINX_PROXY_PASS: http://varnish:8080
+      VIRTUAL_PROTO: https
+      VIRTUAL_HOST: >-
+        ${COMPOSE_PROJECT_NAME:-dapple-cms}.${DEV_TLD:-docker}
+    labels:
+      - dev.orbstack.domains=${COMPOSE_PROJECT_NAME:-dapple-cms}.local
+    working_dir: /app

docker-compose.yml

@@ -52,7 +52,7 @@ services:
       << : *default-environment
       # VARNISH_BYPASS: "true" # Add this to disable caching in varnish.
       # Is used by [nginx-proxy](https://github.com/nginx-proxy/nginx-proxy) or [dory](https://github.com/FreedomBen/dory)
-      VIRTUAL_HOST: ${COMPOSE_PROJECT_NAME}.docker
+      VIRTUAL_HOST: ${COMPOSE_PROJECT_NAME}-varnish.docker
       VIRTUAL_PORT: 8080
 
   cli: # cli container, will be used for executing composer and any local commands (drush, drupal, etc.)

docs/local-development.md

@@ -29,6 +29,27 @@ volumes  in docker-compose, to speed up the containers.
 
 ![OSX preference pane providing access to VirtioFS](docs/images/virtiofs.png)
 
+### Configuration of https
+
+Install mkcert on your host machine and generate and install a root certificate
+by running mkcert -install on your host machine (one time only).
+
+Mac users can run: `brew install mkcert` to install mkcert
+
+Then run:
+
+`mkcert -install`
+
+Mac users should then do (one time only):
+
+$ mkdir -p ~/.local/share && ln -s "$(mkcert -CAROOT)" ~/.local/share
+
+#### If you are using Dory
+
+Update the ssl_certs_dir as described here:
+
+[https://github.com/reload/drupal-apache-fpm?tab=readme-ov-file#using-autogenerated-certificates](https://github.com/reload/drupal-apache-fpm?tab=readme-ov-file#using-autogenerated-certificates)
+
 ## Howtos
 
 ### Enable XDebug

openapi.json

@@ -1002,6 +1002,14 @@
                       "description": "The name of a tag."
                     }
                   },
+                  "partners": {
+                    "type": "array",
+                    "description": "The partners associated with the event.",
+                    "items": {
+                      "type": "string",
+                      "description": "The name of a partner."
+                    }
+                  },
                   "ticket_categories": {
                     "type": "array",
                     "description": "Ticket categories used for the event. Not present for events without ticketing.",

package.json

@@ -7,8 +7,8 @@
     "@lhci/cli": "^0.8",
     "@testing-library/cypress": "^10.0.2",
     "@types/node": "^18.11.11",
-    "@typescript-eslint/eslint-plugin": "^8.16.0",
-    "@typescript-eslint/parser": "^8.16.0",
+    "@typescript-eslint/eslint-plugin": "^8.17.0",
+    "@typescript-eslint/parser": "^8.17.0",
     "chrome-launcher": "^0.15.1",
     "cypress": "^13.16.0",
     "cypress-if": "^1.13.1",