Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -161,16 +161,6 @@ services:
- "traefik.port=9200"
profiles:
- search
artemis:
container_name: "${COMPOSE_PROJECT_NAME}-artemis"
image: apache/activemq-artemis
depends_on:
- app
networks:
- internal
- stonehenge-network
profiles:
- queue
chromium:
image: selenium/standalone-chromium
environment:
Expand Down
494 changes: 346 additions & 148 deletions composer.lock

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions conf/cmi/block.block.helfirecommendationsblock.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ dependencies:
module:
- helfi_recommendations
- language
- node
- system
theme:
- hdbt
id: helfirecommendationsblock
theme: hdbt
region: content
weight: 1
weight: 10
provider: helfi_recommendations
plugin: helfi_recommendations
settings:
Expand Down
1 change: 0 additions & 1 deletion conf/cmi/core.extension.yml
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,6 @@ module:
social_media: 0
sophron: 0
stage_file_proxy: 0
stomp: 0
system: 0
taxonomy: 0
telephone: 0
Expand Down
7 changes: 6 additions & 1 deletion conf/cmi/editor.editor.full_html.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ dependencies:
module:
- ckeditor5
_core:
default_config_hash: UZ7ojJKs8sEbFs15e0Ub1i_p9w-K20fG40pkpotEWUw
default_config_hash: oCDUwt4GjXQJeBCiJlq5NKEU0d9JP2Kx3QZKMuDAi_g
format: full_html
editor: ckeditor5
settings:
Expand Down Expand Up @@ -146,6 +146,11 @@ settings:
weight: 18
search: '<a name="[^"]*">(.*?)<\/a>'
replace: $1
-
enabled: true
weight: 19
search: '(<a\b[^>]*?)\s+target\s*=\s*("_blank"|_blank)'
replace: $1
ckeditor5_sourceEditing:
allowed_tags:
- '<figure tabindex>'
Expand Down
7 changes: 6 additions & 1 deletion conf/cmi/editor.editor.minimal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ dependencies:
module:
- ckeditor5
_core:
default_config_hash: CbXr91M60wTYziM5ZHPNPrGb9khkUYjzkVVdyE3re9o
default_config_hash: 5XykmWxByyrIQ2N9_zHqVQlMtBUy9wc5P9lPrM_g7oQ
format: minimal
editor: ckeditor5
settings:
Expand Down Expand Up @@ -128,6 +128,11 @@ settings:
weight: 18
search: '<a name="[^"]*">(.*?)<\/a>'
replace: $1
-
enabled: true
weight: 19
search: '(<a\b[^>]*?)\s+target\s*=\s*("_blank"|_blank)'
replace: $1
ckeditor5_sourceEditing:
allowed_tags:
- '<p data-chat-trigger>'
Expand Down
1 change: 1 addition & 0 deletions conf/cmi/imagemagick.settings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ _core:
default_config_hash: do7QLcSY6lDV82NBI3jy5FNsUwWFjjJzXmHPTGsSvIQ
quality: 75
binaries: imagemagick
imagemagick_version: v7
path_to_binaries: ''
prepend: ''
log_warnings: true
Expand Down
7 changes: 0 additions & 7 deletions conf/cmi/language/sv/views.view.archive.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,7 @@ display:
exposed_sorts_label: 'Sortera efter'
sort_asc_label: Stigande
sort_desc_label: Fallande
arguments:
created_year_month:
title: '{{ arguments.created_year_month }}'
block_1:
display_title: Block
display_options:
arguments:
created_year_month:
title: '{{ arguments.created_year_month }}'
page_1:
display_title: Sida
5 changes: 0 additions & 5 deletions conf/cmi/language/sv/views.view.files.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ display:
display_options:
title: Filer
fields:
fid:
label: Fid
filename:
label: Namn
separator: ', '
Expand All @@ -26,8 +24,6 @@ display:
label: 'Datum för ändring'
count:
label: 'Används i'
alter:
path: 'admin/content/files/usage/{{ fid }}'
format_plural_string: !!binary MSBwbGFjZQNAY291bnQgcGxhY2Vz
pager:
options:
Expand Down Expand Up @@ -76,7 +72,6 @@ display:
label: 'Registrerar modul'
count:
label: 'Antal använd'
format_plural_string: !!binary MQNAY291bnQ=
pager:
options:
tags:
Expand Down
3 changes: 0 additions & 3 deletions conf/cmi/language/sv/views.view.user_admin_people.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@ display:
label: Roller
created:
label: 'Medlem i'
settings:
future_format: '@interval'
past_format: '@interval'
access:
label: 'Senast åtkomst'
settings:
Expand Down
42 changes: 6 additions & 36 deletions public/sites/default/settings.php
Original file line number Diff line number Diff line change
Expand Up @@ -258,42 +258,6 @@ function drupal_get_env(string|array $variables) : mixed {
$config['helfi_proxy.settings']['session_suffix'] = $session_suffix;
}

$amq_destination = drupal_get_env([
'PROJECT_NAME',
]);
$amq_brokers = getenv('AMQ_BROKERS');

if ($amq_brokers && $amq_destination) {
$settings['stomp']['default'] = [
'clientId' => getenv('AMQ_CLIENT_ID') ?: 'client_ ' . $amq_destination,
'login' => getenv('AMQ_USER') ?: NULL,
'passcode' => getenv('AMQ_PASSWORD') ?: NULL,
'destination' => sprintf('/queue/%s', $amq_destination),
'brokers' => $amq_brokers,
'timeout' => ['read' => 12000],
'heartbeat' => [
'send' => 20000,
'receive' => 0,
'observers' => [
[
'class' => '\Stomp\Network\Observer\HeartbeatEmitter',
],
],
],
];

$queues = [
'helfi_navigation_menu_queue',
'helfi_api_base_revision',
];
foreach ($queues as $queue) {
// $settings['queue_service_' . $queue] = 'queue.stomp.default';
}
// You must configure project specific queues manually in 'all.settings.php'
// file.
// @see https://github.com/City-of-Helsinki/drupal-helfi-platform/blob/main/documentation/queue.md
}

if (
($redis_host = getenv('REDIS_HOST')) &&
file_exists('modules/contrib/redis/redis.services.yml') &&
Expand Down Expand Up @@ -401,6 +365,12 @@ function drupal_get_env(string|array $variables) : mixed {
$config['helfi_search.settings']['openai_model'] = getenv('OPENAI_MODEL');
}

// Hakuvahti:
if (getenv('HAKUVAHTI_URL')) {
$config['helfi_hakuvahti.settings']['base_url'] = getenv('HAKUVAHTI_URL');
$config['helfi_hakuvahti.settings']['api_key'] = getenv('HAKUVAHTI_API_KEY');
}

// E2E test users. We should never do this in production, so adding a failsafe
// in case the environment variable would ever end up in production.
if (getenv('APP_ENV') !== 'production' && $e2e_test_user = getenv('E2E_TEST_USER')) {
Expand Down
52 changes: 26 additions & 26 deletions public/themes/custom/hdbt_subtheme/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion tools/make/drupal.mk
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ drush-sanitize-database:

PHONY += drush-create-dump
drush-create-dump: ## Create database dump to dump.sql
$(call drush,sql-dump --structure-tables-key=common --extra-dump=--no-tablespaces --result-file=/app/dump.sql)
$(call drush,sql-dump --structure-tables-key=common --extra-dump='--no-tablespaces --skip-ssl' --result-file=/app/dump.sql)

PHONY += open-db-gui
open-db-gui: ## Open database with GUI tool
Expand Down