diff --git a/.github/workflows/composer.yaml b/.github/workflows/composer.yaml index b6ae0026..9468935d 100644 --- a/.github/workflows/composer.yaml +++ b/.github/workflows/composer.yaml @@ -77,4 +77,4 @@ jobs: docker network create frontend - run: | - docker compose run --rm phpfpm composer audit + docker compose run --rm phpfpm composer audit --locked diff --git a/.prettierignore b/.prettierignore new file mode 100644 index 00000000..9e55d961 --- /dev/null +++ b/.prettierignore @@ -0,0 +1,2 @@ +# Ignore all Drupal config since it is nearly all autogenerated by config-export +config/ diff --git a/CHANGELOG.md b/CHANGELOG.md index d7d690d9..bd07bbc9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,14 @@ Nedenfor ses dato for release og beskrivelse af opgaver som er implementeret. ## [Under udvikling] +* [PR-514](https://github.com/itk-dev/selvbetjening.aarhuskommune.dk/pull/514) + * Opdaterede til OS2Forms Core 5.1.0. + * Opdaterede `Full HTML`- og `Simpel HTML`-tekstformater til at benytte + CKEditor 5. + * Skiftede fra DAWA (udfaset) til adressevælgeren ifb. adresseopslag. + * Skiftede fra DAWA (udfaset) til datafordeleren ifb. matrikelopslag. + * Opdaterede til den moderniserede datafordeler ifb. CVR opslag og P-nummer + opslag. * [PR-513](https://github.com/itk-dev/selvbetjening.aarhuskommune.dk/pull/513) Tilføjede endnu en fiks køjobkommando – redigering! * [PR-512](https://github.com/itk-dev/selvbetjening.aarhuskommune.dk/pull/512) diff --git a/composer.json b/composer.json index 1c01b162..24296124 100644 --- a/composer.json +++ b/composer.json @@ -31,7 +31,7 @@ "itk-dev/os2forms_nemlogin_openid_connect": "^2.2", "itk-dev/os2forms_user_field_lookup": "^1.1", "itk-dev/web_accessibility_statement": "^1.1", - "os2forms/os2forms": "dev-release/5.1.4 as 5.1.4", + "os2forms/os2forms": "dev-release/5.1.5 as 5.1.5", "os2forms/os2forms_forloeb_profile": "^1.15", "os2forms/os2forms_get_organized": "^2.0", "os2forms/os2forms_organisation": "^2.1", diff --git a/composer.lock b/composer.lock index 63931d01..18b736c6 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "5db9ae6f59099928fe37b846f0f618dd", + "content-hash": "d002d86635fe07292980e3a6c02071d4", "packages": [ { "name": "asm89/stack-cors", @@ -9165,16 +9165,16 @@ }, { "name": "os2forms/os2forms", - "version": "dev-release/5.1.4", + "version": "dev-release/5.1.5", "source": { "type": "git", "url": "https://github.com/itk-dev/os2forms.git", - "reference": "c096da53921df25ebf8841338da4b672940fbf5c" + "reference": "9680ac4491346e86a17d08dd74c8abde31e2ec72" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/itk-dev/os2forms/zipball/c096da53921df25ebf8841338da4b672940fbf5c", - "reference": "c096da53921df25ebf8841338da4b672940fbf5c", + "url": "https://api.github.com/repos/itk-dev/os2forms/zipball/9680ac4491346e86a17d08dd74c8abde31e2ec72", + "reference": "9680ac4491346e86a17d08dd74c8abde31e2ec72", "shasum": "" }, "require": { @@ -9310,9 +9310,9 @@ ], "description": "Drupal 10 OS2Form module provides advanced webform functionality for Danish Municipalities", "support": { - "source": "https://github.com/itk-dev/os2forms/tree/feature/maps-element-display" + "source": "https://github.com/itk-dev/os2forms/tree/release/5.1.5" }, - "time": "2026-04-13T12:02:30+00:00" + "time": "2026-06-09T12:43:37+00:00" }, { "name": "os2forms/os2forms_forloeb_profile", @@ -9683,16 +9683,16 @@ }, { "name": "os2web/os2web_datalookup", - "version": "3.0.3", + "version": "3.3.0", "source": { "type": "git", "url": "https://github.com/OS2web/os2web_datalookup.git", - "reference": "3101b541829506a28ec9b827f04088b59f8a8a9f" + "reference": "361d030fdcfff64b8fc90f2673f5ef0619df32d1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/OS2web/os2web_datalookup/zipball/3101b541829506a28ec9b827f04088b59f8a8a9f", - "reference": "3101b541829506a28ec9b827f04088b59f8a8a9f", + "url": "https://api.github.com/repos/OS2web/os2web_datalookup/zipball/361d030fdcfff64b8fc90f2673f5ef0619df32d1", + "reference": "361d030fdcfff64b8fc90f2673f5ef0619df32d1", "shasum": "" }, "require": { @@ -9714,9 +9714,9 @@ "description": "Provides integration with Danish data lookup services such as Service platformen or Datafordeler.", "support": { "issues": "https://github.com/OS2web/os2web_datalookup/issues", - "source": "https://github.com/OS2web/os2web_datalookup/tree/3.0.3" + "source": "https://github.com/OS2web/os2web_datalookup/tree/3.3.0" }, - "time": "2025-11-19T09:33:00+00:00" + "time": "2026-06-08T06:56:10+00:00" }, { "name": "os2web/os2web_key", @@ -23582,9 +23582,9 @@ "aliases": [ { "package": "os2forms/os2forms", - "version": "dev-release/5.1.4", - "alias": "5.1.4", - "alias_normalized": "5.1.4.0" + "version": "dev-release/5.1.5", + "alias": "5.1.5", + "alias_normalized": "5.1.5.0" } ], "minimum-stability": "dev", diff --git a/config/sync/advancedqueue.advancedqueue_queue.fasit_queue.yml b/config/sync/advancedqueue.advancedqueue_queue.fasit_queue.yml index 604434ea..7f05f88b 100644 --- a/config/sync/advancedqueue.advancedqueue_queue.fasit_queue.yml +++ b/config/sync/advancedqueue.advancedqueue_queue.fasit_queue.yml @@ -10,6 +10,7 @@ backend_configuration: processor: daemon processing_time: 280 locked: false +stop_when_empty: true threshold: type: 0 limit: 0 diff --git a/config/sync/advancedqueue.advancedqueue_queue.get_organized_queue.yml b/config/sync/advancedqueue.advancedqueue_queue.get_organized_queue.yml index 13ed29aa..f830694b 100644 --- a/config/sync/advancedqueue.advancedqueue_queue.get_organized_queue.yml +++ b/config/sync/advancedqueue.advancedqueue_queue.get_organized_queue.yml @@ -10,6 +10,7 @@ backend_configuration: processor: daemon processing_time: 280 locked: false +stop_when_empty: true threshold: type: 0 limit: 0 diff --git a/config/sync/advancedqueue.advancedqueue_queue.os2forms_api_request_handler.yml b/config/sync/advancedqueue.advancedqueue_queue.os2forms_api_request_handler.yml index 02a30844..0936cd7f 100644 --- a/config/sync/advancedqueue.advancedqueue_queue.os2forms_api_request_handler.yml +++ b/config/sync/advancedqueue.advancedqueue_queue.os2forms_api_request_handler.yml @@ -10,6 +10,7 @@ backend_configuration: processor: daemon processing_time: 280 locked: false +stop_when_empty: true threshold: type: 0 limit: 0 diff --git a/config/sync/advancedqueue.advancedqueue_queue.os2forms_digital_post.yml b/config/sync/advancedqueue.advancedqueue_queue.os2forms_digital_post.yml index a6421de8..23f19c2d 100644 --- a/config/sync/advancedqueue.advancedqueue_queue.os2forms_digital_post.yml +++ b/config/sync/advancedqueue.advancedqueue_queue.os2forms_digital_post.yml @@ -15,6 +15,7 @@ backend_configuration: processor: daemon processing_time: 280 locked: false +stop_when_empty: true threshold: type: 0 limit: 0 diff --git a/config/sync/advancedqueue.advancedqueue_queue.os2forms_forloeb_notification.yml b/config/sync/advancedqueue.advancedqueue_queue.os2forms_forloeb_notification.yml index 73847a02..04e79e1b 100644 --- a/config/sync/advancedqueue.advancedqueue_queue.os2forms_forloeb_notification.yml +++ b/config/sync/advancedqueue.advancedqueue_queue.os2forms_forloeb_notification.yml @@ -12,6 +12,7 @@ backend_configuration: processor: daemon processing_time: 90 locked: false +stop_when_empty: true threshold: type: 0 limit: 0 diff --git a/config/sync/advancedqueue.advancedqueue_queue.os2web_audit.yml b/config/sync/advancedqueue.advancedqueue_queue.os2web_audit.yml index a4ca417c..d0c41476 100644 --- a/config/sync/advancedqueue.advancedqueue_queue.os2web_audit.yml +++ b/config/sync/advancedqueue.advancedqueue_queue.os2web_audit.yml @@ -1,4 +1,4 @@ -uuid: null +uuid: b0f9375f-7d63-4260-a80a-389cdf703416 langcode: da status: true dependencies: {} diff --git a/config/sync/advancedqueue.advancedqueue_queue.send_digital_post.yml b/config/sync/advancedqueue.advancedqueue_queue.send_digital_post.yml index aa9e8953..6e1ac826 100644 --- a/config/sync/advancedqueue.advancedqueue_queue.send_digital_post.yml +++ b/config/sync/advancedqueue.advancedqueue_queue.send_digital_post.yml @@ -10,6 +10,7 @@ backend_configuration: processor: daemon processing_time: 280 locked: false +stop_when_empty: true threshold: type: 0 limit: 0 diff --git a/config/sync/core.extension.yml b/config/sync/core.extension.yml index 41cefe02..93f76f18 100644 --- a/config/sync/core.extension.yml +++ b/config/sync/core.extension.yml @@ -14,7 +14,6 @@ module: breakpoint: 0 chosen: 0 chosen_lib: 0 - ckeditor: 0 ckeditor5: 0 clamav: 0 coc_forms_auto_export: 0 diff --git a/config/sync/editor.editor.basic_html.yml b/config/sync/editor.editor.basic_html.yml index 9cf54736..b18fd740 100644 --- a/config/sync/editor.editor.basic_html.yml +++ b/config/sync/editor.editor.basic_html.yml @@ -5,37 +5,63 @@ dependencies: config: - filter.format.basic_html module: - - ckeditor + - ckeditor5 _core: default_config_hash: a5AV-gXquwTaJSpYtmWEQiGfr7JWvtqAX7thbPr8qEk format: basic_html -editor: ckeditor +editor: ckeditor5 settings: toolbar: - rows: - - - name: Formatting - items: - - Bold - - Italic - - name: Linking - items: - - DrupalLink - - DrupalUnlink - - name: Lists - items: - - BulletedList - - NumberedList - - name: Media - items: - - Blockquote - - DrupalImage - - name: "Block Formatting" - items: - - Format - - name: Tools - items: - - Source - plugins: {} + items: + - bold + - italic + - "|" + - link + - "|" + - bulletedList + - numberedList + - "|" + - blockQuote + - drupalInsertImage + - "|" + - heading + - "|" + - sourceEditing + - "|" + - code + plugins: + ckeditor5_heading: + enabled_headings: + - heading2 + - heading3 + - heading4 + - heading5 + - heading6 + ckeditor5_imageResize: + allow_resize: true + ckeditor5_list: + properties: + reversed: false + startIndex: true + multiBlock: true + ckeditor5_sourceEditing: + allowed_tags: + - "" + - "
" + - "
" + - "
" + - "" + - "" + - "
" + - "