From 0ef66b91e04e6cbb0c16e29754d1f0f30d9e4e9e Mon Sep 17 00:00:00 2001 From: hel-platta-automation <95360595+hel-platta-automation@users.noreply.github.com> Date: Fri, 13 Dec 2024 07:06:25 +0000 Subject: [PATCH] Update configuration --- .dockerignore | 4 + composer.lock | 54 ++++++----- .../language/fi/views.view.helfi_redirect.yml | 30 +++--- conf/cmi/language/fi/views.view.redirect.yml | 10 +- ...views.view.scheduler_scheduled_content.yml | 8 +- .../language/ru/views.view.helfi_redirect.yml | 3 + .../language/sv/views.view.helfi_redirect.yml | 6 ++ conf/cmi/views.view.helfi_redirect.yml | 97 ++++++++++++++++++- tools/make/project/db-sync.sh | 3 +- tools/make/project/git.mk | 2 +- 10 files changed, 164 insertions(+), 53 deletions(-) create mode 100644 .dockerignore diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 000000000..e3708ede3 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,4 @@ +.git/ +.github/ +.idea/ +*.sql diff --git a/composer.lock b/composer.lock index 415439b15..6b410f473 100644 --- a/composer.lock +++ b/composer.lock @@ -4300,12 +4300,12 @@ "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-tools.git", - "reference": "d5698a468a97c4e39cbce35dbbe575db0fbe6ca6" + "reference": "845a8c470a6f593b08e100f3c3d688fb07600f76" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/d5698a468a97c4e39cbce35dbbe575db0fbe6ca6", - "reference": "d5698a468a97c4e39cbce35dbbe575db0fbe6ca6", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/845a8c470a6f593b08e100f3c3d688fb07600f76", + "reference": "845a8c470a6f593b08e100f3c3d688fb07600f76", "shasum": "" }, "require": { @@ -4380,7 +4380,7 @@ "source": "https://github.com/City-of-Helsinki/drupal-tools/tree/main", "issues": "https://github.com/City-of-Helsinki/drupal-tools/issues" }, - "time": "2024-12-12T07:30:07+00:00" + "time": "2024-12-12T12:14:31+00:00" }, { "name": "drupal/helfi_navigation", @@ -4418,16 +4418,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "4.10.1", + "version": "4.10.2", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "79ab4aca9d4734e6bd8fd86c696ead5f6a78b618" + "reference": "88e462f81f62bd9c23c2b76277c6412bc83808d8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/79ab4aca9d4734e6bd8fd86c696ead5f6a78b618", - "reference": "79ab4aca9d4734e6bd8fd86c696ead5f6a78b618", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/88e462f81f62bd9c23c2b76277c6412bc83808d8", + "reference": "88e462f81f62bd9c23c2b76277c6412bc83808d8", "shasum": "" }, "require": { @@ -4553,10 +4553,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.10.1", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.10.2", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2024-12-11T07:54:12+00:00" + "time": "2024-12-13T06:59:39+00:00" }, { "name": "drupal/helfi_proxy", @@ -5507,29 +5507,29 @@ }, { "name": "drupal/openid_connect", - "version": "3.0.0-alpha3", + "version": "3.0.0-alpha4", "source": { "type": "git", "url": "https://git.drupalcode.org/project/openid_connect.git", - "reference": "3.0.0-alpha3" + "reference": "3.0.0-alpha4" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/openid_connect-3.0.0-alpha3.zip", - "reference": "3.0.0-alpha3", - "shasum": "002616dc2bfeb6b23204297e77d1f7a5369e69b3" + "url": "https://ftp.drupal.org/files/projects/openid_connect-3.0.0-alpha4.zip", + "reference": "3.0.0-alpha4", + "shasum": "3239f8a2e5fc98de1be7561309cb12153ef5b7c9" }, "require": { - "drupal/core": "^9.3 || ^10", + "drupal/core": "^9.5 || ^10.2 || ^11", "drupal/externalauth": "^2.0", "ext-json": "*", - "php": ">=7.1.0" + "php": ">=8.1.0" }, "type": "drupal-module", "extra": { "drupal": { - "version": "3.0.0-alpha3", - "datestamp": "1710708951", + "version": "3.0.0-alpha4", + "datestamp": "1734043889", "security-coverage": { "status": "not-covered", "message": "Alpha releases are not covered by Drupal security advisories." @@ -5549,6 +5549,10 @@ "name": "jcnventura", "homepage": "https://www.drupal.org/user/122464" }, + { + "name": "mstrelan", + "homepage": "https://www.drupal.org/user/314289" + }, { "name": "pfrilling", "homepage": "https://www.drupal.org/user/169695" @@ -14224,16 +14228,16 @@ }, { "name": "twig/twig", - "version": "v3.17.0", + "version": "v3.17.1", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "d3a64b742a5e74c57e3964d766e1032982145872" + "reference": "677ef8da6497a03048192aeeb5aa3018e379ac71" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/d3a64b742a5e74c57e3964d766e1032982145872", - "reference": "d3a64b742a5e74c57e3964d766e1032982145872", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/677ef8da6497a03048192aeeb5aa3018e379ac71", + "reference": "677ef8da6497a03048192aeeb5aa3018e379ac71", "shasum": "" }, "require": { @@ -14288,7 +14292,7 @@ ], "support": { "issues": "https://github.com/twigphp/Twig/issues", - "source": "https://github.com/twigphp/Twig/tree/v3.17.0" + "source": "https://github.com/twigphp/Twig/tree/v3.17.1" }, "funding": [ { @@ -14300,7 +14304,7 @@ "type": "tidelift" } ], - "time": "2024-12-10T15:19:11+00:00" + "time": "2024-12-12T09:58:10+00:00" }, { "name": "twistor/flysystem-stream-wrapper", diff --git a/conf/cmi/language/fi/views.view.helfi_redirect.yml b/conf/cmi/language/fi/views.view.helfi_redirect.yml index 78822a3cb..039970d49 100644 --- a/conf/cmi/language/fi/views.view.helfi_redirect.yml +++ b/conf/cmi/language/fi/views.view.helfi_redirect.yml @@ -5,20 +5,20 @@ display: status_code: group_info: group_items: - 7: - title: '300 Multiple Choices' 1: - title: '300 Multiple Choices' + title: '300 Useita valintoja' 2: - title: '301 Moved Permanently' + title: '301 Pysyvästi siirretty' 3: - title: '302 Found' + title: '302 Löydetty' 4: - title: '303 See Other' + title: '303 Kts. toinen' 5: - title: '304 Not Modified' + title: '304 Muuttamaton' 6: - title: '305 Use Proxy' + title: '305 Käytä proxyä' + 7: + title: '307 Tilapäinen uudelleenohjaus' label: Tilakoodi expose: label: Tilakoodi @@ -34,6 +34,9 @@ display: is_custom: expose: label: 'Käyttäjän luoma' + status: + expose: + label: Julkaistu exposed_form: options: submit_button: Suodata @@ -48,10 +51,10 @@ display: items_per_page_options_all_label: '- Kaikki -' offset_label: Offset tags: - next: 'next ›' - previous: '‹ previous' - first: '« first' - last: 'last »' + previous: '‹ edellinen' + next: 'seuraava ›' + first: '« ensimmäinen' + last: 'viimeinen »' fields: redirect_bulk_form: action_title: Valinnalla @@ -63,6 +66,9 @@ display: is_custom: label: 'Käyttäjän luoma' separator: ', ' + status: + label: Julkaistu + separator: ', ' empty: area_text_custom: content: 'Ei ole vielä uudelleenohjaksia.' diff --git a/conf/cmi/language/fi/views.view.redirect.yml b/conf/cmi/language/fi/views.view.redirect.yml index d325e8940..d816d0aa0 100644 --- a/conf/cmi/language/fi/views.view.redirect.yml +++ b/conf/cmi/language/fi/views.view.redirect.yml @@ -18,7 +18,7 @@ display: 20: title: '305 Käytä proxyä' 7: - title: '300 Multiple Choices' + title: '307 Tilapäinen uudelleenohjaus' label: Tilakoodi expose: label: Tilakoodi @@ -41,10 +41,10 @@ display: pager: options: tags: - previous: '‹ previous' - next: 'next ›' - first: '« first' - last: 'last »' + previous: '‹ edellinen' + next: 'seuraava ›' + first: '« ensimmäinen' + last: 'viimeinen »' expose: items_per_page_label: 'Merkintöjä sivua kohti' items_per_page_options_all_label: '- Kaikki -' diff --git a/conf/cmi/language/fi/views.view.scheduler_scheduled_content.yml b/conf/cmi/language/fi/views.view.scheduler_scheduled_content.yml index 4958d25c9..f543bc5df 100644 --- a/conf/cmi/language/fi/views.view.scheduler_scheduled_content.yml +++ b/conf/cmi/language/fi/views.view.scheduler_scheduled_content.yml @@ -13,10 +13,10 @@ display: pager: options: tags: - previous: '‹ previous' - next: 'next ›' - first: '« first' - last: 'last »' + previous: '‹ edellinen' + next: 'seuraava ›' + first: '« ensimmäinen' + last: 'viimeinen »' fields: node_bulk_form: action_title: Toiminto diff --git a/conf/cmi/language/ru/views.view.helfi_redirect.yml b/conf/cmi/language/ru/views.view.helfi_redirect.yml index c4f53878f..355cb42a3 100644 --- a/conf/cmi/language/ru/views.view.helfi_redirect.yml +++ b/conf/cmi/language/ru/views.view.helfi_redirect.yml @@ -69,6 +69,9 @@ display: is_custom: expose: label: Собственная + status: + expose: + label: Опубликовано page_1: display_title: Страница display_options: diff --git a/conf/cmi/language/sv/views.view.helfi_redirect.yml b/conf/cmi/language/sv/views.view.helfi_redirect.yml index aef24d5d4..08b9bf6d3 100644 --- a/conf/cmi/language/sv/views.view.helfi_redirect.yml +++ b/conf/cmi/language/sv/views.view.helfi_redirect.yml @@ -16,6 +16,9 @@ display: separator: ', ' created: label: Skapad + status: + label: Publicerad + separator: ', ' pager: options: tags: @@ -58,6 +61,9 @@ display: is_custom: expose: label: Anpassad + status: + expose: + label: Publicerad page_1: display_title: Sida display_options: diff --git a/conf/cmi/views.view.helfi_redirect.yml b/conf/cmi/views.view.helfi_redirect.yml index a3f968da8..cb34781c6 100644 --- a/conf/cmi/views.view.helfi_redirect.yml +++ b/conf/cmi/views.view.helfi_redirect.yml @@ -9,7 +9,7 @@ dependencies: - redirect - user _core: - default_config_hash: h9PYX1gxwmkwfgZUv0BJ_Js6-woWmUbyPSK0INlm538 + default_config_hash: T8ZZY-2rwfH9QPXho30lLjOnPsWsLzhy6YGOTix228k id: helfi_redirect label: Redirect module: views @@ -224,6 +224,73 @@ display: multi_type: separator separator: ', ' field_api_classes: false + status: + id: status + table: redirect + field: status + relationship: none + group_type: group + admin_label: '' + entity_type: redirect + entity_field: status + plugin_id: field + label: Published + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: value + type: boolean + settings: + format: default + format_custom_false: '' + format_custom_true: '' + group_column: value + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false language: id: language table: redirect @@ -631,14 +698,14 @@ display: exposed: true expose: operator_id: '' - label: Julkaistu + label: Published description: '' use_operator: false operator: status_op operator_limit_selection: false operator_list: { } identifier: status - required: true + required: false remember: false multiple: false remember_roles: @@ -675,14 +742,22 @@ display: row_class: '' default_row_class: true columns: + redirect_bulk_form: redirect_bulk_form redirect_source__path: redirect_source__path redirect_redirect__uri: redirect_redirect__uri status_code: status_code + is_custom: is_custom + status: status language: language created: created operations: operations default: created info: + redirect_bulk_form: + align: '' + separator: '' + empty_column: false + responsive: '' redirect_source__path: sortable: true default_sort_order: asc @@ -704,6 +779,20 @@ display: separator: '' empty_column: false responsive: '' + is_custom: + sortable: true + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + status: + sortable: true + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' language: sortable: true default_sort_order: asc @@ -719,8 +808,6 @@ display: empty_column: false responsive: '' operations: - sortable: false - default_sort_order: asc align: '' separator: '' empty_column: false diff --git a/tools/make/project/db-sync.sh b/tools/make/project/db-sync.sh index 9ed73f5d9..2d69f38ed 100644 --- a/tools/make/project/db-sync.sh +++ b/tools/make/project/db-sync.sh @@ -17,8 +17,9 @@ if [ ! -n "$OC_POD_NAME" ]; then exit 1 fi +oc rsh $OC_POD_NAME rm -f /tmp/dump.sql oc rsh $OC_POD_NAME drush sql:dump --structure-tables-key=common \ - --extra-dump="--no-tablespaces --hex-blob" \ + --extra-dump='--no-tablespaces --hex-blob' \ --result-file=/tmp/dump.sql oc rsync $OC_POD_NAME:/tmp/dump.sql /app diff --git a/tools/make/project/git.mk b/tools/make/project/git.mk index 9ef1f3d9e..50b03e875 100644 --- a/tools/make/project/git.mk +++ b/tools/make/project/git.mk @@ -1,3 +1,3 @@ PHONY += copy-commit-message-script copy-commit-message-script: - @$(foreach name,$(shell find public/modules/custom public/themes/custom public/modules/contrib public/themes/contrib -type d -name ".git" -exec dirname {} \; 2> /dev/null ) .,cp tools/commit-msg $(name)/.git/hooks;) + @$(foreach name,$(shell find public/modules/custom public/themes/custom public/modules/contrib public/themes/contrib -type d -name ".git" -exec dirname {} \; 2> /dev/null ) .,cp tools/commit-msg $(name)/.git/hooks || true;)