From 2d90ff058daf03c0442d33d89bf2c42a840701b0 Mon Sep 17 00:00:00 2001 From: hel-platta-automation <95360595+hel-platta-automation@users.noreply.github.com> Date: Thu, 12 Dec 2024 07:38:42 +0000 Subject: [PATCH] Update configuration --- compose.yaml | 16 +++- composer.lock | 52 ++++++------- ...ty_form_display.node.news_item.default.yml | 4 + .../language/ar/views.view.helfi_redirect.yml | 42 ++++++++++ .../language/de/views.view.helfi_redirect.yml | 77 +++++++++++++++++++ .../language/es/views.view.helfi_redirect.yml | 77 +++++++++++++++++++ .../language/et/views.view.helfi_redirect.yml | 51 ++++++++++++ .../language/fa/views.view.helfi_redirect.yml | 43 +++++++++++ ...ews_article.field_news_item_links_link.yml | 2 +- ...e.news_item.field_news_item_links_link.yml | 2 +- ...of_links_item.field_list_of_links_link.yml | 2 +- .../language/fr/views.view.helfi_redirect.yml | 77 +++++++++++++++++++ .../language/ru/views.view.helfi_redirect.yml | 76 ++++++++++++++++++ .../language/se/views.view.helfi_redirect.yml | 19 +++++ .../language/uk/views.view.helfi_redirect.yml | 73 ++++++++++++++++++ .../zh-hans/views.view.helfi_redirect.yml | 70 +++++++++++++++++ phpunit.xml.dist | 6 +- tools/make/override.mk | 1 - tools/make/project/db-sync.sh | 24 ++++++ tools/make/project/install.mk | 10 +-- 20 files changed, 680 insertions(+), 44 deletions(-) create mode 100644 conf/cmi/language/ar/views.view.helfi_redirect.yml create mode 100644 conf/cmi/language/de/views.view.helfi_redirect.yml create mode 100644 conf/cmi/language/es/views.view.helfi_redirect.yml create mode 100644 conf/cmi/language/et/views.view.helfi_redirect.yml create mode 100644 conf/cmi/language/fa/views.view.helfi_redirect.yml create mode 100644 conf/cmi/language/fr/views.view.helfi_redirect.yml create mode 100644 conf/cmi/language/ru/views.view.helfi_redirect.yml create mode 100644 conf/cmi/language/se/views.view.helfi_redirect.yml create mode 100644 conf/cmi/language/uk/views.view.helfi_redirect.yml create mode 100644 conf/cmi/language/zh-hans/views.view.helfi_redirect.yml create mode 100644 tools/make/project/db-sync.sh diff --git a/compose.yaml b/compose.yaml index 703a8d29d..0e64d1db1 100644 --- a/compose.yaml +++ b/compose.yaml @@ -8,6 +8,7 @@ services: depends_on: - db environment: + WEBROOT: /app/public STAGE_FILE_PROXY_ORIGIN: "${STAGE_FILE_PROXY_ORIGIN}" STAGE_FILE_PROXY_ORIGIN_DIR: "${STAGE_FILE_PROXY_ORIGIN_DIR}" APP_ENV: "${APP_ENV:-local}" @@ -24,7 +25,6 @@ services: # DOCKERHOST: host.docker.internal # Use drush server to run functional tests, so we don't have to care about # permission or SSL issues. - SIMPLETEST_BASE_URL: "http://app:8888" BROWSERTEST_OUTPUT_BASE_URL: "https://${DRUPAL_HOSTNAME}" BROWSERTEST_OUTPUT_DIRECTORY: "/app/public/sites/default/files/simpletest" DRUPAL_VARNISH_HOST: "${COMPOSE_PROJECT_NAME}-varnish" @@ -160,13 +160,21 @@ services: profiles: - queue chromium: - # @todo Update this to newer version once minkphp supports Selenium 4. - # @see https://github.com/minkphp/MinkSelenium2Driver/pull/372 - image: seleniarm/standalone-chromium:106.0 + image: selenium/standalone-chromium + environment: + SE_NODE_OVERRIDE_MAX_SESSIONS: "true" + SE_NODE_MAX_SESSIONS: "16" + SE_START_XVFB: "false" + SE_START_VNC: "false" + SE_SESSION_RETRY_INTERVAL: "1" + SE_SESSION_REQUEST_TIMEOUT: "10" + depends_on: + - app networks: - internal profiles: - testing + networks: internal: external: false diff --git a/composer.lock b/composer.lock index d1147164b..ecdd82f4d 100644 --- a/composer.lock +++ b/composer.lock @@ -4253,16 +4253,16 @@ }, { "name": "drupal/hdbt", - "version": "6.8.17", + "version": "6.8.20", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "063e0c51a83860dc872b9c7f9528f5d29824d5d8" + "reference": "d35f85ec2d568c68df67d01029b2c2cf952d63e9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/063e0c51a83860dc872b9c7f9528f5d29824d5d8", - "reference": "063e0c51a83860dc872b9c7f9528f5d29824d5d8", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/d35f85ec2d568c68df67d01029b2c2cf952d63e9", + "reference": "d35f85ec2d568c68df67d01029b2c2cf952d63e9", "shasum": "" }, "require": { @@ -4281,10 +4281,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.8.17", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.8.20", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2024-12-09T14:01:58+00:00" + "time": "2024-12-12T07:31:27+00:00" }, { "name": "drupal/hdbt_admin", @@ -4480,12 +4480,12 @@ "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-tools.git", - "reference": "2abe26c3735150f630dd1203c3e60a77173d90fd" + "reference": "d5698a468a97c4e39cbce35dbbe575db0fbe6ca6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/2abe26c3735150f630dd1203c3e60a77173d90fd", - "reference": "2abe26c3735150f630dd1203c3e60a77173d90fd", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/d5698a468a97c4e39cbce35dbbe575db0fbe6ca6", + "reference": "d5698a468a97c4e39cbce35dbbe575db0fbe6ca6", "shasum": "" }, "require": { @@ -4560,7 +4560,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-03T06:30:07+00:00" + "time": "2024-12-12T07:30:07+00:00" }, { "name": "drupal/helfi_navigation", @@ -4598,16 +4598,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "4.10.0", + "version": "4.10.1", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "ba094b39d6a02da3f2f9085c47d3326509eb7caa" + "reference": "79ab4aca9d4734e6bd8fd86c696ead5f6a78b618" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/ba094b39d6a02da3f2f9085c47d3326509eb7caa", - "reference": "ba094b39d6a02da3f2f9085c47d3326509eb7caa", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/79ab4aca9d4734e6bd8fd86c696ead5f6a78b618", + "reference": "79ab4aca9d4734e6bd8fd86c696ead5f6a78b618", "shasum": "" }, "require": { @@ -4733,10 +4733,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.10.0", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.10.1", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2024-12-10T11:12:36+00:00" + "time": "2024-12-11T07:54:12+00:00" }, { "name": "drupal/helfi_proxy", @@ -13836,8 +13836,8 @@ "type": "library", "extra": { "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" } }, "autoload": { @@ -14002,8 +14002,8 @@ "type": "library", "extra": { "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" } }, "autoload": { @@ -15435,16 +15435,16 @@ }, { "name": "twig/twig", - "version": "v3.16.0", + "version": "v3.17.0", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "475ad2dc97d65d8631393e721e7e44fb544f0561" + "reference": "d3a64b742a5e74c57e3964d766e1032982145872" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/475ad2dc97d65d8631393e721e7e44fb544f0561", - "reference": "475ad2dc97d65d8631393e721e7e44fb544f0561", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/d3a64b742a5e74c57e3964d766e1032982145872", + "reference": "d3a64b742a5e74c57e3964d766e1032982145872", "shasum": "" }, "require": { @@ -15499,7 +15499,7 @@ ], "support": { "issues": "https://github.com/twigphp/Twig/issues", - "source": "https://github.com/twigphp/Twig/tree/v3.16.0" + "source": "https://github.com/twigphp/Twig/tree/v3.17.0" }, "funding": [ { @@ -15511,7 +15511,7 @@ "type": "tidelift" } ], - "time": "2024-11-29T08:27:05+00:00" + "time": "2024-12-10T15:19:11+00:00" }, { "name": "twistor/flysystem-stream-wrapper", diff --git a/conf/cmi/core.entity_form_display.node.news_item.default.yml b/conf/cmi/core.entity_form_display.node.news_item.default.yml index b189ba6da..b2aa6d52d 100644 --- a/conf/cmi/core.entity_form_display.node.news_item.default.yml +++ b/conf/cmi/core.entity_form_display.node.news_item.default.yml @@ -79,6 +79,7 @@ third_party_settings: group_updating_news: children: - field_news_item_updating_news + - field_news_item_updating_news label: 'Updating news' region: content parent_name: '' @@ -96,6 +97,9 @@ third_party_settings: - in_recommendations - show_annif_block - annif_suggested_topics + - in_recommendations + - show_annif_block + - annif_suggested_topics label: 'Automatically recommended content' region: content parent_name: '' diff --git a/conf/cmi/language/ar/views.view.helfi_redirect.yml b/conf/cmi/language/ar/views.view.helfi_redirect.yml new file mode 100644 index 000000000..2086c0bbb --- /dev/null +++ b/conf/cmi/language/ar/views.view.helfi_redirect.yml @@ -0,0 +1,42 @@ +display: + default: + display_title: الرئيسي + display_options: + fields: + redirect_source__path: + label: من + separator: ', ' + is_custom: + label: مخصص + separator: ', ' + created: + label: الإنشاء + pager: + options: + tags: + next: 'التالية ›' + previous: '‹ السابقة' + first: '« الأولى' + last: 'الأخيرة »' + expose: + items_per_page_options_all_label: '- الكل -' + offset_label: الإزاحة + exposed_form: + options: + submit_button: انتقاء + reset_button_label: 'إعادة الضبط' + exposed_sorts_label: 'الترتيب حسب' + sort_asc_label: تصاعدي + sort_desc_label: تنازلي + filters: + redirect_source__path: + expose: + label: من + redirect_redirect__uri: + expose: + label: إلى + is_custom: + expose: + label: مخصص + page_1: + display_title: الصفحة diff --git a/conf/cmi/language/de/views.view.helfi_redirect.yml b/conf/cmi/language/de/views.view.helfi_redirect.yml new file mode 100644 index 000000000..2069e4878 --- /dev/null +++ b/conf/cmi/language/de/views.view.helfi_redirect.yml @@ -0,0 +1,77 @@ +label: Umleiten +description: 'Liste der Umleitungen' +display: + default: + display_title: Master + display_options: + title: Umleiten + fields: + redirect_bulk_form: + action_title: 'Mit Auswahl' + redirect_source__path: + label: Von + separator: ', ' + is_custom: + label: Benutzerdefiniert + separator: ', ' + created: + label: Erstellt + pager: + options: + tags: + next: 'nächste Seite ›' + previous: '‹ vorherige Seite' + first: '« erste Seite' + last: 'letzte Seite »' + expose: + items_per_page_label: 'Elemente pro Seite' + items_per_page_options_all_label: '- Alle -' + offset_label: Versatz + exposed_form: + options: + submit_button: Filter + reset_button_label: Zurücksetzen + exposed_sorts_label: Sortierung + sort_asc_label: Aufsteigend + sort_desc_label: Absteigend + empty: + area_text_custom: + content: 'Es wurde noch keine Umleitung eingerichtet.' + filters: + redirect_source__path: + expose: + label: Von + redirect_redirect__uri: + expose: + label: An + status_code: + expose: + label: Statuscode + group_info: + label: Statuscode + group_items: + 1: + title: '300 Mehrere Auswahlmöglichkeiten' + 2: + title: '301 Dauerhaft verschoben' + 3: + title: '302 Gefunden' + 4: + title: '303 Siehe andere' + 5: + title: '304 Nicht modifiziert' + 6: + title: '305 Proxy verwenden' + 7: + title: '307 Temporäre Weiterleitung' + language: + expose: + label: Originalsprache + is_custom: + expose: + label: Benutzerdefiniert + page_1: + display_title: Seite + display_options: + menu: + title: Umleiten diff --git a/conf/cmi/language/es/views.view.helfi_redirect.yml b/conf/cmi/language/es/views.view.helfi_redirect.yml new file mode 100644 index 000000000..0153d3fec --- /dev/null +++ b/conf/cmi/language/es/views.view.helfi_redirect.yml @@ -0,0 +1,77 @@ +label: Redirección +description: 'List of redirects' +display: + default: + display_title: Máster + display_options: + title: Redirección + fields: + redirect_bulk_form: + action_title: 'Con selección' + redirect_source__path: + label: Desde + separator: ', ' + is_custom: + label: Personalizado + separator: ', ' + created: + label: Creado + pager: + options: + tags: + next: 'siguiente ›' + previous: '‹ anterior' + first: '« primero' + last: 'último »' + expose: + items_per_page_label: 'Elementos por página' + items_per_page_options_all_label: '- Todo -' + offset_label: Desplazamiento + exposed_form: + options: + submit_button: Filtro + reset_button_label: Restablecer + exposed_sorts_label: 'Ordenar por' + sort_asc_label: Asc + sort_desc_label: Desc + empty: + area_text_custom: + content: 'There is no redirect yet.' + filters: + redirect_source__path: + expose: + label: Desde + redirect_redirect__uri: + expose: + label: Para + status_code: + expose: + label: 'Status code' + group_info: + label: 'Status code' + group_items: + 1: + title: '300 Múltiples posibilidades' + 2: + title: '301 Movido permanentemente' + 3: + title: '302 Encontrado' + 4: + title: '303 Ver otra ubicación' + 5: + title: '304 No modificado' + 6: + title: '305 Usar proxy' + 7: + title: '307 Redirección temporal' + language: + expose: + label: 'Lenguaje original' + is_custom: + expose: + label: Personalizado + page_1: + display_title: Página + display_options: + menu: + title: Redirección diff --git a/conf/cmi/language/et/views.view.helfi_redirect.yml b/conf/cmi/language/et/views.view.helfi_redirect.yml new file mode 100644 index 000000000..cf71a1e9a --- /dev/null +++ b/conf/cmi/language/et/views.view.helfi_redirect.yml @@ -0,0 +1,51 @@ +label: 'Suunatakse ümber' +display: + default: + display_title: Peamine + display_options: + title: 'Suunatakse ümber' + fields: + redirect_source__path: + label: Kellelt + separator: ', ' + is_custom: + label: Kohandatud + separator: ', ' + created: + label: Loodud + pager: + options: + tags: + next: 'järgmine ›' + previous: '‹ eelmine' + first: '« esimene' + last: 'viimane »' + expose: + items_per_page_label: 'Kirjeid lehel' + items_per_page_options_all_label: '- Kõik -' + offset_label: Nihe + exposed_form: + options: + submit_button: Filtreeri + reset_button_label: Tühista + exposed_sorts_label: 'Sorteerimise alus' + sort_asc_label: Kasvav + sort_desc_label: Kahanev + filters: + redirect_source__path: + expose: + label: Kellelt + redirect_redirect__uri: + expose: + label: Kellele + language: + expose: + label: 'Algne keel' + is_custom: + expose: + label: Kohandatud + page_1: + display_title: Lehekülg + display_options: + menu: + title: 'Suunatakse ümber' diff --git a/conf/cmi/language/fa/views.view.helfi_redirect.yml b/conf/cmi/language/fa/views.view.helfi_redirect.yml new file mode 100644 index 000000000..7c52f5ca3 --- /dev/null +++ b/conf/cmi/language/fa/views.view.helfi_redirect.yml @@ -0,0 +1,43 @@ +display: + default: + display_title: مدیر + display_options: + fields: + redirect_bulk_form: + action_title: 'با انتخاب شده‌ها' + redirect_source__path: + label: از + is_custom: + label: سفارشی + created: + label: 'ایجاد گردید' + pager: + options: + tags: + next: 'بعدی ›' + previous: '‹ قبلی' + first: '« ابتدا' + last: 'انتها »' + expose: + items_per_page_label: 'آیتم‌ها در هر صفحه' + items_per_page_options_all_label: '- همه -' + offset_label: جابجایی + exposed_form: + options: + submit_button: فیلتر + reset_button_label: بازنشانی + exposed_sorts_label: 'مرتب کن بر اساس' + sort_asc_label: صعودی + sort_desc_label: نزولی + filters: + redirect_source__path: + expose: + label: از + redirect_redirect__uri: + expose: + label: به + is_custom: + expose: + label: سفارشی + page_1: + display_title: صفحه diff --git a/conf/cmi/language/fi/field.field.node.news_article.field_news_item_links_link.yml b/conf/cmi/language/fi/field.field.node.news_article.field_news_item_links_link.yml index 6f8993a9a..4d8e877fd 100644 --- a/conf/cmi/language/fi/field.field.node.news_article.field_news_item_links_link.yml +++ b/conf/cmi/language/fi/field.field.node.news_article.field_news_item_links_link.yml @@ -1,2 +1,2 @@ label: Linkki -description: 'Sisäinen tai ulkoinen linkki haluttuun kohteeseen. Linkin teksti -kentän arvo näytetään sivuston käyttäjälle.' +description: 'Lisää sisäisen tai ulkoisen linkin URL-osoite sekä sivulla näkyvä linkkiteksti.' diff --git a/conf/cmi/language/fi/field.field.node.news_item.field_news_item_links_link.yml b/conf/cmi/language/fi/field.field.node.news_item.field_news_item_links_link.yml index 6f8993a9a..4d8e877fd 100644 --- a/conf/cmi/language/fi/field.field.node.news_item.field_news_item_links_link.yml +++ b/conf/cmi/language/fi/field.field.node.news_item.field_news_item_links_link.yml @@ -1,2 +1,2 @@ label: Linkki -description: 'Sisäinen tai ulkoinen linkki haluttuun kohteeseen. Linkin teksti -kentän arvo näytetään sivuston käyttäjälle.' +description: 'Lisää sisäisen tai ulkoisen linkin URL-osoite sekä sivulla näkyvä linkkiteksti.' diff --git a/conf/cmi/language/fi/field.field.paragraph.list_of_links_item.field_list_of_links_link.yml b/conf/cmi/language/fi/field.field.paragraph.list_of_links_item.field_list_of_links_link.yml index 6f8993a9a..4d8e877fd 100644 --- a/conf/cmi/language/fi/field.field.paragraph.list_of_links_item.field_list_of_links_link.yml +++ b/conf/cmi/language/fi/field.field.paragraph.list_of_links_item.field_list_of_links_link.yml @@ -1,2 +1,2 @@ label: Linkki -description: 'Sisäinen tai ulkoinen linkki haluttuun kohteeseen. Linkin teksti -kentän arvo näytetään sivuston käyttäjälle.' +description: 'Lisää sisäisen tai ulkoisen linkin URL-osoite sekä sivulla näkyvä linkkiteksti.' diff --git a/conf/cmi/language/fr/views.view.helfi_redirect.yml b/conf/cmi/language/fr/views.view.helfi_redirect.yml new file mode 100644 index 000000000..99dfed7dd --- /dev/null +++ b/conf/cmi/language/fr/views.view.helfi_redirect.yml @@ -0,0 +1,77 @@ +label: Rediriger +description: 'Liste des redirections' +display: + default: + display_title: Maître + display_options: + title: Rediriger + fields: + redirect_bulk_form: + action_title: 'Pour la sélection' + redirect_source__path: + label: 'A partir de' + separator: ', ' + is_custom: + label: Personnalisé + separator: ', ' + created: + label: Créé + pager: + options: + tags: + next: "suivant\_›" + previous: "‹\_précédent" + first: "«\_premier" + last: "dernier\_»" + expose: + items_per_page_label: 'Éléments par page' + items_per_page_options_all_label: '- Tout -' + offset_label: Décalage + exposed_form: + options: + submit_button: Filtrer + reset_button_label: Réinitialiser + exposed_sorts_label: 'Trier par' + sort_asc_label: Asc + sort_desc_label: Desc + empty: + area_text_custom: + content: "Il n'y a pas encore de redirection." + filters: + redirect_source__path: + expose: + label: 'A partir de' + redirect_redirect__uri: + expose: + label: À + status_code: + expose: + label: 'Code du statut' + group_info: + label: 'Code du statut' + group_items: + 1: + title: '300 Choix Multiples' + 2: + title: '301 Redirection Permanente' + 3: + title: '302 Trouvé' + 4: + title: '303 Voir Ailleurs' + 5: + title: '304 Non Modifié' + 6: + title: '305 Utilise un Proxy' + 7: + title: '307 Redirection Temporaire' + language: + expose: + label: 'Langue initiale' + is_custom: + expose: + label: Personnalisé + page_1: + display_title: Page + display_options: + menu: + title: Rediriger diff --git a/conf/cmi/language/ru/views.view.helfi_redirect.yml b/conf/cmi/language/ru/views.view.helfi_redirect.yml new file mode 100644 index 000000000..c30e24858 --- /dev/null +++ b/conf/cmi/language/ru/views.view.helfi_redirect.yml @@ -0,0 +1,76 @@ +label: Переадресация +display: + default: + display_title: Основной + display_options: + title: Переадресация + fields: + redirect_bulk_form: + action_title: 'С выделенным' + redirect_source__path: + label: От + separator: ', ' + is_custom: + label: Собственная + separator: ', ' + created: + label: Создано + pager: + options: + tags: + next: 'следующая ›' + previous: '‹ предыдущая' + first: '« первая' + last: 'последняя »' + expose: + items_per_page_label: 'Элементов на страницу' + items_per_page_options_all_label: '- Все -' + offset_label: Пропустить + exposed_form: + options: + submit_button: Фильтр + reset_button_label: Сбросить + exposed_sorts_label: 'Сортировать по' + sort_asc_label: 'По возрастанию' + sort_desc_label: 'По убыванию' + empty: + area_text_custom: + content: 'Перенаправлений пока нет.' + filters: + redirect_source__path: + expose: + label: От + redirect_redirect__uri: + expose: + label: Кому + status_code: + expose: + label: 'Код состояния' + group_info: + label: 'Код состояния' + group_items: + 1: + title: '300 Множество Выборов' + 2: + title: '301 Перемещёно Окончательно' + 3: + title: '302 Найдено' + 4: + title: '303 Смотреть Другое' + 5: + title: '304 Не Изменялось' + 6: + title: '305 Использовать Прокси' + 7: + title: '307 - Временно перемещено' + language: + expose: + label: 'Язык оригинала' + is_custom: + expose: + label: Собственная + page_1: + display_title: Страница + display_options: + menu: + title: Переадресация diff --git a/conf/cmi/language/se/views.view.helfi_redirect.yml b/conf/cmi/language/se/views.view.helfi_redirect.yml new file mode 100644 index 000000000..d9d00ed44 --- /dev/null +++ b/conf/cmi/language/se/views.view.helfi_redirect.yml @@ -0,0 +1,19 @@ +display: + default: + display_title: Default + display_options: + fields: + created: + label: Almmuhuvvon + pager: + options: + tags: + next: 'boahtte ›' + previous: '‹ ovddit' + first: '« vuosttaš' + last: 'maŋemuš »' + exposed_form: + options: + exposed_sorts_label: Sirre + page_1: + display_title: Siidu diff --git a/conf/cmi/language/uk/views.view.helfi_redirect.yml b/conf/cmi/language/uk/views.view.helfi_redirect.yml new file mode 100644 index 000000000..a1179ea6d --- /dev/null +++ b/conf/cmi/language/uk/views.view.helfi_redirect.yml @@ -0,0 +1,73 @@ +label: Переспрямувати +display: + default: + display_title: Головне + display_options: + title: Переспрямувати + fields: + redirect_bulk_form: + action_title: 'З вибраним' + redirect_source__path: + label: Від + separator: ', ' + is_custom: + label: Власний + separator: ', ' + created: + label: Створено + pager: + options: + tags: + next: 'наступна ›' + previous: '‹ попередня' + first: '« перша' + last: 'остання »' + expose: + items_per_page_label: 'Елементів на сторінку' + items_per_page_options_all_label: '- Усе -' + offset_label: Зміщення + exposed_form: + options: + submit_button: Фільтр + reset_button_label: Скинути + exposed_sorts_label: 'Впорядкувати за' + sort_asc_label: Зрост + sort_desc_label: Спад + filters: + redirect_source__path: + expose: + label: Від + redirect_redirect__uri: + expose: + label: До + status_code: + expose: + label: 'Код стану' + group_info: + label: 'Код стану' + group_items: + 1: + title: '300 Безліч Виборів' + 2: + title: '301 Переміщене Остаточно' + 3: + title: '302 Знайдене' + 4: + title: '303 Дивитися Інше' + 5: + title: '304 Не Змінювалося' + 6: + title: '305 Використовувати Проксі' + 7: + title: '307 - Тимчасово переміщене' + language: + expose: + label: 'Мова оригіналу' + is_custom: + expose: + label: Власний + page_1: + display_title: Сторінка + display_options: + menu: + title: Переспрямувати diff --git a/conf/cmi/language/zh-hans/views.view.helfi_redirect.yml b/conf/cmi/language/zh-hans/views.view.helfi_redirect.yml new file mode 100644 index 000000000..5b9530975 --- /dev/null +++ b/conf/cmi/language/zh-hans/views.view.helfi_redirect.yml @@ -0,0 +1,70 @@ +label: 重定向 +display: + default: + display_title: 主 + display_options: + title: 重定向 + fields: + redirect_bulk_form: + action_title: 对所选项目 + redirect_source__path: + label: 源自 + separator: ', ' + is_custom: + label: 自定义 + separator: ', ' + created: + label: 已建立 + pager: + options: + tags: + next: '下一页 ›' + previous: '‹ 上一页' + first: '« 第一页' + last: '末页 »' + expose: + items_per_page_label: 每页条目数 + items_per_page_options_all_label: '- 全部 -' + offset_label: 偏移量 + exposed_form: + options: + submit_button: 过滤 + reset_button_label: 重置 + exposed_sorts_label: 排序依据 + sort_asc_label: 升序 + sort_desc_label: 降序 + filters: + redirect_source__path: + expose: + label: 源自 + redirect_redirect__uri: + expose: + label: 到 + status_code: + group_info: + group_items: + 1: + title: 300多种选择 + 2: + title: 301永久移动 + 3: + title: 302临时重定向 + 4: + title: 303查看其它位置 + 5: + title: 304未修改 + 6: + title: 305使用代理 + 7: + title: 307临时重定向 + language: + expose: + label: 原始语言 + is_custom: + expose: + label: 自定义 + page_1: + display_title: 页面 + display_options: + menu: + title: 重定向 diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 22d88d297..7c1efa6e2 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -15,11 +15,11 @@ - - + + - + diff --git a/tools/make/override.mk b/tools/make/override.mk index 6f4a034bd..df8baac5e 100644 --- a/tools/make/override.mk +++ b/tools/make/override.mk @@ -1,4 +1,3 @@ # Docker CLI container CLI_SERVICE=app -CLI_USER=druid CLI_SHELL=bash diff --git a/tools/make/project/db-sync.sh b/tools/make/project/db-sync.sh new file mode 100644 index 000000000..9ed73f5d9 --- /dev/null +++ b/tools/make/project/db-sync.sh @@ -0,0 +1,24 @@ +#!/bin/sh + +set -e + +if [ ! -n "$OC_PROJECT_NAME" ]; then + echo "OC_PROJECT_NAME not set." + exit 1; +fi + +oc login --token=${1} --server=https://api.arodevtest.hel.fi:6443 +oc project ${OC_PROJECT_NAME} + +OC_POD_NAME=$(oc get pods -o name | grep drupal-cron | grep -v deploy) + +if [ ! -n "$OC_POD_NAME" ]; then + echo "Failed to parse pod name." + exit 1 +fi + +oc rsh $OC_POD_NAME drush sql:dump --structure-tables-key=common \ + --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/install.mk b/tools/make/project/install.mk index 483d64f7e..4328f6532 100644 --- a/tools/make/project/install.mk +++ b/tools/make/project/install.mk @@ -10,18 +10,14 @@ OC_LOGIN_TOKEN ?= $(shell bash -c 'read -s -p "You must obtain an API token by v SYNC_TARGETS := drush-sync-db ifneq ($(DUMP_SQL_EXISTS),yes) -SYNC_TARGETS := oc-login oc-sync +SYNC_TARGETS := oc-sync endif -PHONY += oc-login -oc-login: - $(call drush,helfi:oc:login $(OC_LOGIN_TOKEN)) - PHONY += oc-sync oc-sync: - $(call drush,helfi:oc:get-dump) + docker run --env-file .env -it --rm -v .:/app --name helfi-oc ghcr.io/city-of-helsinki/drupal-oc-cli:latest sh -c "chmod +x /app/tools/make/project/db-sync.sh && /app/tools/make/project/db-sync.sh $(OC_LOGIN_TOKEN)" $(call drush,sql-query --file=${DOCKER_PROJECT_ROOT}/$(DUMP_SQL_FILENAME),SQL dump imported) - $(call drush,helfi:oc:sanitize-database) + $(call drush,sql-query \"UPDATE file_managed SET uri = REPLACE(uri, 'azure://', 'public://');\",Sanitized Azure URIs) $(call drush,cr) $(call drush,cim -y) $(call drush,cr)