From 32141e51327a471387773a7532bc0254e0f53010 Mon Sep 17 00:00:00 2001 From: Jesper Kristensen Date: Fri, 24 May 2024 09:47:24 +0200 Subject: [PATCH 1/3] 1513: Synced prod configuration --- ...ty_form_display.node.blog_post.default.yml | 19 +++++++++---- ...ty_view_display.node.blog_post.default.yml | 18 ++++++++++--- ...ntity_view_display.node.blog_post.full.yml | 12 ++++++++- ...ity_view_display.node.blog_post.teaser.yml | 2 ++ ..._view_display.node.blog_post.term_view.yml | 2 ++ ....node.blog_post.field_fil_til_download.yml | 27 +++++++++++++++++++ config/sync/update.settings.yml | 14 ---------- config/sync/views.view.cases.yml | 2 +- web/sites/default/settings.php | 6 ++--- 9 files changed, 73 insertions(+), 29 deletions(-) create mode 100644 config/sync/field.field.node.blog_post.field_fil_til_download.yml delete mode 100644 config/sync/update.settings.yml diff --git a/config/sync/core.entity_form_display.node.blog_post.default.yml b/config/sync/core.entity_form_display.node.blog_post.default.yml index 13b7c6511..b40a973c2 100644 --- a/config/sync/core.entity_form_display.node.blog_post.default.yml +++ b/config/sync/core.entity_form_display.node.blog_post.default.yml @@ -8,11 +8,13 @@ dependencies: - field.field.node.blog_post.field_banner_image - field.field.node.blog_post.field_category - field.field.node.blog_post.field_contact_person + - field.field.node.blog_post.field_fil_til_download - field.field.node.blog_post.field_image - field.field.node.blog_post.field_section - node.type.blog_post module: - entity_browser + - file - paragraphs - paragraphs_ee - paragraphs_features @@ -25,7 +27,7 @@ mode: default content: body: type: text_textarea_with_summary - weight: 10 + weight: 11 region: content settings: rows: 9 @@ -55,13 +57,13 @@ content: third_party_settings: { } field_category: type: options_buttons - weight: 12 + weight: 14 region: content settings: { } third_party_settings: { } field_contact_person: type: entity_reference_autocomplete - weight: 22 + weight: 15 region: content settings: match_operator: CONTAINS @@ -69,6 +71,13 @@ content: size: 60 placeholder: '' third_party_settings: { } + field_fil_til_download: + type: file_generic + weight: 10 + region: content + settings: + progress_indicator: throbber + third_party_settings: { } field_image: type: entity_browser_file weight: 9 @@ -85,7 +94,7 @@ content: third_party_settings: { } field_section: type: paragraphs - weight: 11 + weight: 13 region: content settings: title: Paragraph @@ -154,7 +163,7 @@ content: placeholder: '' third_party_settings: { } translation: - weight: 10 + weight: 12 region: content settings: { } third_party_settings: { } diff --git a/config/sync/core.entity_view_display.node.blog_post.default.yml b/config/sync/core.entity_view_display.node.blog_post.default.yml index 7a19aae15..944ab7c86 100644 --- a/config/sync/core.entity_view_display.node.blog_post.default.yml +++ b/config/sync/core.entity_view_display.node.blog_post.default.yml @@ -7,11 +7,13 @@ dependencies: - field.field.node.blog_post.field_banner_image - field.field.node.blog_post.field_category - field.field.node.blog_post.field_contact_person + - field.field.node.blog_post.field_fil_til_download - field.field.node.blog_post.field_image - field.field.node.blog_post.field_section - node.type.blog_post module: - entity_reference_revisions + - file - image - text - user @@ -33,7 +35,7 @@ content: settings: link: true third_party_settings: { } - weight: 1 + weight: 2 region: content field_contact_person: type: entity_reference_entity_view @@ -42,7 +44,15 @@ content: view_mode: default link: true third_party_settings: { } - weight: 14 + weight: 5 + region: content + field_fil_til_download: + type: file_default + label: above + settings: + use_description_as_link_text: true + third_party_settings: { } + weight: 1 region: content field_image: type: image @@ -53,7 +63,7 @@ content: image_loading: attribute: lazy third_party_settings: { } - weight: 2 + weight: 3 region: content field_section: type: entity_reference_revisions_entity_view @@ -62,7 +72,7 @@ content: view_mode: default link: '' third_party_settings: { } - weight: 3 + weight: 4 region: content hidden: addtoany: true diff --git a/config/sync/core.entity_view_display.node.blog_post.full.yml b/config/sync/core.entity_view_display.node.blog_post.full.yml index 769d87e49..9f5187039 100644 --- a/config/sync/core.entity_view_display.node.blog_post.full.yml +++ b/config/sync/core.entity_view_display.node.blog_post.full.yml @@ -8,11 +8,13 @@ dependencies: - field.field.node.blog_post.field_banner_image - field.field.node.blog_post.field_category - field.field.node.blog_post.field_contact_person + - field.field.node.blog_post.field_fil_til_download - field.field.node.blog_post.field_image - field.field.node.blog_post.field_section - node.type.blog_post module: - entity_reference_revisions + - file - image - layout_builder - text @@ -48,7 +50,15 @@ content: view_mode: default link: true third_party_settings: { } - weight: 12 + weight: 5 + region: content + field_fil_til_download: + type: file_default + label: above + settings: + use_description_as_link_text: true + third_party_settings: { } + weight: 4 region: content field_image: type: image diff --git a/config/sync/core.entity_view_display.node.blog_post.teaser.yml b/config/sync/core.entity_view_display.node.blog_post.teaser.yml index 8604d833f..c2744455d 100644 --- a/config/sync/core.entity_view_display.node.blog_post.teaser.yml +++ b/config/sync/core.entity_view_display.node.blog_post.teaser.yml @@ -8,6 +8,7 @@ dependencies: - field.field.node.blog_post.field_banner_image - field.field.node.blog_post.field_category - field.field.node.blog_post.field_contact_person + - field.field.node.blog_post.field_fil_til_download - field.field.node.blog_post.field_image - field.field.node.blog_post.field_section - node.type.blog_post @@ -37,6 +38,7 @@ hidden: field_banner_image: true field_category: true field_contact_person: true + field_fil_til_download: true field_image: true field_section: true langcode: true diff --git a/config/sync/core.entity_view_display.node.blog_post.term_view.yml b/config/sync/core.entity_view_display.node.blog_post.term_view.yml index bfbc925b6..e01e1f583 100644 --- a/config/sync/core.entity_view_display.node.blog_post.term_view.yml +++ b/config/sync/core.entity_view_display.node.blog_post.term_view.yml @@ -8,6 +8,7 @@ dependencies: - field.field.node.blog_post.field_banner_image - field.field.node.blog_post.field_category - field.field.node.blog_post.field_contact_person + - field.field.node.blog_post.field_fil_til_download - field.field.node.blog_post.field_image - field.field.node.blog_post.field_section - node.type.blog_post @@ -56,5 +57,6 @@ hidden: addtoany: true field_banner_image: true field_contact_person: true + field_fil_til_download: true field_section: true langcode: true diff --git a/config/sync/field.field.node.blog_post.field_fil_til_download.yml b/config/sync/field.field.node.blog_post.field_fil_til_download.yml new file mode 100644 index 000000000..456e198c2 --- /dev/null +++ b/config/sync/field.field.node.blog_post.field_fil_til_download.yml @@ -0,0 +1,27 @@ +uuid: d4b3d2dd-2aad-4aa8-9afd-9bf270a79000 +langcode: da +status: true +dependencies: + config: + - field.storage.node.field_fil_til_download + - node.type.blog_post + module: + - file +id: node.blog_post.field_fil_til_download +field_name: field_fil_til_download +entity_type: node +bundle: blog_post +label: 'Fil til download' +description: 'Fil relateret til portfolio.' +required: false +translatable: false +default_value: { } +default_value_callback: '' +settings: + handler: 'default:file' + handler_settings: { } + file_directory: portfolio_documents + file_extensions: 'doc docx pdf' + max_filesize: '50 MB' + description_field: true +field_type: file diff --git a/config/sync/update.settings.yml b/config/sync/update.settings.yml deleted file mode 100644 index 75d039c10..000000000 --- a/config/sync/update.settings.yml +++ /dev/null @@ -1,14 +0,0 @@ -_core: - default_config_hash: 2QzULf0zovJQx3J06Y9rufzzfi-CY2CTTlEfJJh2Qyw -langcode: da -check: - disabled_extensions: false - interval_days: 1 -fetch: - url: null - max_attempts: 2 - timeout: 30 -notification: - emails: - - dtio.themes@gmail.com - threshold: all diff --git a/config/sync/views.view.cases.yml b/config/sync/views.view.cases.yml index 23d6571a0..a800318e4 100644 --- a/config/sync/views.view.cases.yml +++ b/config/sync/views.view.cases.yml @@ -1535,7 +1535,7 @@ display: type: full options: offset: 0 - items_per_page: 9 + items_per_page: 0 total_pages: null id: 0 tags: diff --git a/web/sites/default/settings.php b/web/sites/default/settings.php index 235a0667f..142cc7126 100644 --- a/web/sites/default/settings.php +++ b/web/sites/default/settings.php @@ -820,10 +820,8 @@ * * Keep this code block at the end of this file to take full effect. */ -# -# if (file_exists($app_root . '/' . $site_path . '/settings.local.php')) { -# include $app_root . '/' . $site_path . '/settings.local.php'; -# } if (file_exists($app_root . "/" . $site_path . "/settings.local.php")) { include $app_root . "/" . $site_path . "/settings.local.php"; } + +$settings['config_sync_directory'] = '../config/sync'; From 763f2f48100dda010ec166027323aa727ec063f5 Mon Sep 17 00:00:00 2001 From: Jesper Kristensen Date: Fri, 24 May 2024 09:51:07 +0200 Subject: [PATCH 2/3] 1513: Added site improve module --- composer.json | 1 + composer.lock | 31 ++++++++++++++++++++++++++++++- config/sync/core.extension.yml | 1 + 3 files changed, 32 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 16554dc5f..c9c7f722b 100644 --- a/composer.json +++ b/composer.json @@ -56,6 +56,7 @@ "drupal/viewsreference": "^2.0@beta", "drupal/webform": "6.2.x-dev@dev", "drush/drush": "^11 || ^12", + "itk-dev/itk_siteimprove": "^1.3", "itk-dev/web_accessibility_statement": "^1.1", "wikimedia/composer-merge-plugin": "^2.1" }, diff --git a/composer.lock b/composer.lock index 637e0072e..0b1539346 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": "2ed06b3f3a3b07d5da0a9c36c216e6bc", + "content-hash": "5080a01d7c40d684f0b6b44e83f08692", "packages": [ { "name": "asm89/stack-cors", @@ -5628,6 +5628,35 @@ ], "time": "2023-12-03T20:05:35+00:00" }, + { + "name": "itk-dev/itk_siteimprove", + "version": "1.3.0", + "source": { + "type": "git", + "url": "https://github.com/itk-dev/siteimprove-d8.git", + "reference": "b9108d71fdfc5b4efd93e1e5f0b83adf18fbbb8d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/itk-dev/siteimprove-d8/zipball/b9108d71fdfc5b4efd93e1e5f0b83adf18fbbb8d", + "reference": "b9108d71fdfc5b4efd93e1e5f0b83adf18fbbb8d", + "shasum": "" + }, + "type": "drupal-module", + "notification-url": "https://packagist.org/downloads/", + "license": [ + "GPL-2.0+" + ], + "description": "Provides siteimprove functionality", + "keywords": [ + "drupal" + ], + "support": { + "issues": "https://github.com/itk-dev/siteimprove-d8/issues", + "source": "https://github.com/itk-dev/siteimprove-d8/tree/1.3.0" + }, + "time": "2023-09-06T09:51:42+00:00" + }, { "name": "itk-dev/web_accessibility_statement", "version": "1.1.0", diff --git a/config/sync/core.extension.yml b/config/sync/core.extension.yml index 9c5b9b37b..0b4409227 100644 --- a/config/sync/core.extension.yml +++ b/config/sync/core.extension.yml @@ -42,6 +42,7 @@ module: history: 0 honeypot: 0 image: 0 + itk_siteimprove: 0 jquery_ui: 0 jquery_ui_datepicker: 0 jquery_ui_slider: 0 From a38c8d2725397d001621e13fb2a6ec7d847f5d13 Mon Sep 17 00:00:00 2001 From: Jesper Kristensen Date: Fri, 24 May 2024 09:54:50 +0200 Subject: [PATCH 3/3] 1513: Updated change log --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 49c532b7d..a9be9f260 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,9 @@ ## Unreleased +* [PR-21](https://github.com/itk-dev/cfia/pull/21) + Added site improve + ## 2.1.1 * [PR-20](https://github.com/itk-dev/cfia/pull/20)