Compare commits

...

17 Commits

Author SHA1 Message Date
Jürgen Mummert 0e0a888fa9 Replace SlimSelect with Tom Select in event filter 2026-02-23 20:16:40 +01:00
Jürgen Mummert 5d3905632d Fix SlimSelect dropdown scrolling regression 2026-02-23 20:03:08 +01:00
Jürgen Mummert fce467fa87 Harden SlimSelect scroll lock on macOS browsers 2026-02-23 20:00:36 +01:00
Jürgen Mummert f08406ec12 Fix SlimSelect scroll chaining in sticky event filter 2026-02-23 19:57:54 +01:00
Jürgen Mummert f3d4c857e0 Harden organization listing tag enrichment and simplify listener 2026-02-22 17:53:17 +01:00
Jürgen Mummert ff608f7833 Fix organization listing numeric tag rendering and template mapping 2026-02-22 17:41:36 +01:00
Jürgen Mummert 00f65ffd45 Fix nullable logger guard in organization listing listener 2026-02-22 17:12:29 +01:00
Jürgen Mummert 142cab2203 Broaden organization tag enrichment fallbacks for production data variants 2026-02-22 17:10:39 +01:00
Jürgen Mummert acf3d02d13 Add diagnostics for unresolved org tag enrichment rows 2026-02-22 17:06:08 +01:00
Jürgen Mummert add43674cf Add title-based tag enrichment fallback for listing rows 2026-02-22 17:04:01 +01:00
Jürgen Mummert a04c6de362 Add fallback tag relation lookup for organization listing 2026-02-22 17:02:56 +01:00
Jürgen Mummert f8cd256348 Fix org listing data-tags and keep template project-specific 2026-02-22 17:00:04 +01:00
Jürgen Mummert 8c9ea29170 Fix organization listing SQL for MariaDB tags 2026-02-22 16:49:55 +01:00
Jürgen Mummert 8c5921d02a Add list_default_organisationen template: UUID-based logos, improved tag filter 2026-02-22 16:20:07 +01:00
Jürgen Mummert c4a7150f41 Add conditional reset button for event filters 2026-02-22 13:03:58 +01:00
Jürgen Mummert 993b3aa774 Prevent recursive select change loops in event filter 2026-02-22 12:50:35 +01:00
Jürgen Mummert a03612dc9c Set active state on selected filter widgets 2026-02-22 12:16:39 +01:00
3 changed files with 577 additions and 55 deletions
+13
View File
@@ -3,6 +3,7 @@
declare(strict_types=1);
use Contao\Database;
use Contao\Controller;
use Contao\StringUtil;
$GLOBALS['TL_DCA']['tl_module']['palettes']['member_organizations'] = '{title_legend},name,headline,type;{eventmanager_legend},editPage;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID';
@@ -157,3 +158,15 @@ $GLOBALS['TL_DCA']['tl_module']['fields']['eventListDomId'] = [
'eval' => ['includeBlankOption' => true, 'chosen' => true, 'tl_class' => 'w50'],
'sql' => ['type' => 'string', 'length' => 128, 'default' => ''],
];
if (isset($GLOBALS['TL_DCA']['tl_module']['fields']['list_layout'])) {
$GLOBALS['TL_DCA']['tl_module']['fields']['list_layout']['options_callback'] = static function (): array {
$options = Controller::getTemplateGroup('list_');
if (!isset($options['list_default_organisationen'])) {
$options['list_default_organisationen'] = 'list_default_organisationen';
}
return $options;
};
}
+233 -50
View File
@@ -1,17 +1,19 @@
<div id="eventfilters" data-eventlist-id="{{ targetEventListId|default('eventlist')|e('html_attr') }}">
<div class="tag-buttons">
<button type="button" data-filter-tag="all" class="active" aria-pressed="true">Alle</button>
<div class="select-filters">
<div class="widget-select category">
<label for="tag-filter" class="visually-hidden">Kategorie wählen</label>
<select id="tag-filter">
<option value="all" data-placeholder="true">Kategorie wählen</option>
{% for tag in tagButtons|default([]) %}
<button type="button" data-filter-tag="{{ tag.id }}" aria-pressed="false">{{ tag.title }} ({{ tag.count }})</button>
<option value="tag-{{ tag.id }}">{{ tag.title }} ({{ tag.count }})</option>
{% endfor %}
</select>
</div>
<div class="select-filters">
<div class="widget-select places">
<label for="location-filter" class="visually-hidden">Orte:</label>
<label for="location-filter" class="visually-hidden">Ort wählen</label>
<select id="location-filter">
<option value="all">Orte</option>
<option value="all" data-placeholder="true">Ort wählen</option>
{% for location in locations|default([]) %}
<option value="location-{{ location.id }}">{{ location.title }} ({{ location.count }})</option>
{% endfor %}
@@ -19,9 +21,9 @@
</div>
<div class="widget-select org">
<label for="org-filter" class="visually-hidden">Veranstalter:</label>
<label for="org-filter" class="visually-hidden">Veranstalter wählen</label>
<select id="org-filter">
<option value="all">Veranstalter</option>
<option value="all" data-placeholder="true">Veranstalter wählen</option>
{% for organization in organizations|default([]) %}
<option value="org-{{ organization.id }}">{{ organization.title }} ({{ organization.count }})</option>
{% endfor %}
@@ -29,6 +31,8 @@
</div>
</div>
<button type="button" id="eventfilter-reset" class="eventfilter-reset" hidden>Filter zurücksetzen</button>
<p id="eventfilter-status" class="visually-hidden" aria-live="polite"></p>
</div>
@@ -64,19 +68,28 @@
pointer-events: none;
}
#eventfilters .active,
#eventfilters select.active {
#eventfilters .widget-select.active .ts-control {
outline: 2px solid currentColor;
outline-offset: 2px;
}
#eventfilters button:focus-visible,
#eventfilters select:focus-visible {
#eventfilters .ts-control:focus-within {
outline: 2px solid currentColor;
outline-offset: 2px;
}
#eventfilters .eventfilter-reset[hidden] {
display: none;
}
#eventfilters .ts-dropdown-content {
overscroll-behavior: contain;
}
</style>
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/tom-select@2.4.3/dist/css/tom-select.css">
<script src="https://cdn.jsdelivr.net/npm/tom-select@2.4.3/dist/js/tom-select.complete.min.js"></script>
<script type="module">
const filters = document.getElementById('eventfilters');
@@ -94,14 +107,63 @@
list?.classList.add('event-filter-target-list');
const events = list ? Array.from(list.querySelectorAll(':scope > .event')) : [];
const tagButtons = Array.from(filters.querySelectorAll('button[data-filter-tag]'));
const tagSelect = filters.querySelector('#tag-filter');
const locationSelect = filters.querySelector('#location-filter');
const orgSelect = filters.querySelector('#org-filter');
const tagWidget = tagSelect?.closest('.widget-select');
const locationWidget = locationSelect?.closest('.widget-select');
const orgWidget = orgSelect?.closest('.widget-select');
const resetButton = filters.querySelector('#eventfilter-reset');
const status = filters.querySelector('#eventfilter-status');
const animationMs = 220;
let hideTimers = new WeakMap();
let currentFilter = { type: 'tag', value: 'all' };
let currentFilter = { type: 'all', value: 'all' };
let suppressedChangeEvents = 0;
const initTomSelect = (selectElement) => {
if (!selectElement || 'undefined' === typeof window.TomSelect) {
return null;
}
return new window.TomSelect(selectElement, {
create: false,
maxItems: 1,
closeAfterSelect: true,
allowEmptyOption: true,
searchField: [],
controlInput: null,
dropdownParent: selectElement.closest('.widget-select') || undefined,
});
};
const tagTom = initTomSelect(tagSelect);
const locationTom = initTomSelect(locationSelect);
const orgTom = initTomSelect(orgSelect);
const setSelectValue = (selectElement, tomInstance, value) => {
if (!selectElement) {
return;
}
if (selectElement.value === value) {
return;
}
suppressedChangeEvents += 1;
try {
if (tomInstance) {
tomInstance.setValue(value, true);
} else {
selectElement.value = value;
}
} finally {
queueMicrotask(() => {
suppressedChangeEvents = Math.max(0, suppressedChangeEvents - 1);
});
}
};
const clearHideTimer = (eventItem) => {
const timer = hideTimers.get(eventItem);
@@ -134,18 +196,16 @@
};
const setActiveControl = ({ type, value }) => {
tagButtons.forEach((button) => {
const isActive = type === 'tag' && button.dataset.filterTag === value;
button.classList.toggle('active', isActive);
button.setAttribute('aria-pressed', isActive ? 'true' : 'false');
});
const hasActiveTag = type === 'tag' && value !== 'all';
const hasActiveLocation = type === 'location' && value !== 'all';
const hasActiveOrg = type === 'org' && value !== 'all';
if (locationSelect) {
locationSelect.classList.toggle('active', type === 'location');
}
tagWidget?.classList.toggle('active', hasActiveTag);
locationWidget?.classList.toggle('active', hasActiveLocation);
orgWidget?.classList.toggle('active', hasActiveOrg);
if (orgSelect) {
orgSelect.classList.toggle('active', type === 'org');
if (resetButton) {
resetButton.hidden = !(hasActiveTag || hasActiveLocation || hasActiveOrg);
}
};
@@ -171,6 +231,10 @@
return parseIdList(eventItem.dataset.org).includes(filterState.value);
}
if (filterState.type === 'all') {
return true;
}
return true;
};
@@ -182,9 +246,9 @@
const visibleCount = events.filter((eventItem) => !eventItem.hidden).length;
let filterText = 'alle';
if (filterState.type === 'tag' && filterState.value !== 'all') {
const activeButton = tagButtons.find((button) => button.dataset.filterTag === filterState.value);
filterText = activeButton ? activeButton.textContent.trim() : `Tag ${filterState.value}`;
if (filterState.type === 'tag' && tagSelect) {
const option = tagSelect.options[tagSelect.selectedIndex];
filterText = option ? option.textContent.trim() : 'Kategorie wählen';
}
if (filterState.type === 'location' && locationSelect) {
@@ -215,47 +279,166 @@
updateStatus(filterState);
};
tagButtons.forEach((button) => {
button.addEventListener('click', () => {
if (locationSelect) {
locationSelect.value = 'all';
tagSelect?.addEventListener('change', () => {
if (suppressedChangeEvents > 0) {
return;
}
if (orgSelect) {
orgSelect.value = 'all';
}
const selectedValue = tagSelect.value;
applyFilter({ type: 'tag', value: button.dataset.filterTag ?? 'all' });
});
});
locationSelect?.addEventListener('change', () => {
const selectedValue = locationSelect.value;
if (orgSelect) {
orgSelect.value = 'all';
}
setSelectValue(locationSelect, locationTom, 'all');
setSelectValue(orgSelect, orgTom, 'all');
applyFilter(
selectedValue === 'all'
? { type: 'tag', value: 'all' }
? { type: 'all', value: 'all' }
: { type: 'tag', value: selectedValue.replace('tag-', '') },
);
});
locationSelect?.addEventListener('change', () => {
if (suppressedChangeEvents > 0) {
return;
}
const selectedValue = locationSelect.value;
setSelectValue(tagSelect, tagTom, 'all');
setSelectValue(orgSelect, orgTom, 'all');
applyFilter(
selectedValue === 'all'
? { type: 'all', value: 'all' }
: { type: 'location', value: selectedValue.replace('location-', '') },
);
});
orgSelect?.addEventListener('change', () => {
if (suppressedChangeEvents > 0) {
return;
}
const selectedValue = orgSelect.value;
if (locationSelect) {
locationSelect.value = 'all';
}
setSelectValue(tagSelect, tagTom, 'all');
setSelectValue(locationSelect, locationTom, 'all');
applyFilter(
selectedValue === 'all'
? { type: 'tag', value: 'all' }
? { type: 'all', value: 'all' }
: { type: 'org', value: selectedValue.replace('org-', '') },
);
});
resetButton?.addEventListener('click', () => {
setSelectValue(tagSelect, tagTom, 'all');
setSelectValue(locationSelect, locationTom, 'all');
setSelectValue(orgSelect, orgTom, 'all');
applyFilter({ type: 'all', value: 'all' });
});
const getDropdownFromTarget = (target) => {
if (!(target instanceof Element)) {
return null;
}
return target.closest('.ts-dropdown-content, .ts-dropdown');
};
const getScrollContainer = (targetDropdown) => {
if (!targetDropdown) {
return null;
}
if (targetDropdown.scrollHeight > targetDropdown.clientHeight) {
return targetDropdown;
}
const dropdownContent = targetDropdown.classList.contains('ts-dropdown-content')
? targetDropdown
: targetDropdown.querySelector('.ts-dropdown-content');
if (dropdownContent && dropdownContent.scrollHeight > dropdownContent.clientHeight) {
return dropdownContent;
}
return null;
};
const shouldBlockBoundaryScroll = (scrollContainer, delta) => {
if (!scrollContainer || delta === 0) {
return false;
}
const top = scrollContainer.scrollTop;
const height = scrollContainer.clientHeight;
const scrollHeight = scrollContainer.scrollHeight;
const atTop = top <= 0;
const atBottom = top + height >= scrollHeight - 1;
return (atTop && delta < 0) || (atBottom && delta > 0);
};
let lastTouchY = null;
document.addEventListener('wheel', (event) => {
const dropdown = getDropdownFromTarget(event.target);
if (!dropdown) {
return;
}
const scrollContainer = getScrollContainer(dropdown);
if (shouldBlockBoundaryScroll(scrollContainer, event.deltaY)) {
event.preventDefault();
}
event.stopPropagation();
}, { passive: false, capture: true });
document.addEventListener('touchstart', (event) => {
const dropdown = getDropdownFromTarget(event.target);
if (!dropdown || event.touches.length === 0) {
lastTouchY = null;
return;
}
lastTouchY = event.touches[0].clientY;
}, { passive: true, capture: true });
document.addEventListener('touchmove', (event) => {
const dropdown = getDropdownFromTarget(event.target);
if (!dropdown || event.touches.length === 0 || lastTouchY === null) {
return;
}
const scrollContainer = getScrollContainer(dropdown);
if (!scrollContainer) {
return;
}
const currentTouchY = event.touches[0].clientY;
const delta = lastTouchY - currentTouchY;
if (shouldBlockBoundaryScroll(scrollContainer, delta)) {
event.preventDefault();
}
event.stopPropagation();
lastTouchY = currentTouchY;
}, { passive: false, capture: true });
document.addEventListener('touchend', () => {
lastTouchY = null;
}, { passive: true, capture: true });
document.addEventListener('touchcancel', () => {
lastTouchY = null;
}, { passive: true, capture: true });
applyFilter(currentFilter);
</script>
@@ -0,0 +1,326 @@
<?php
declare(strict_types=1);
namespace MummertMedia\EventManagerBundle\EventListener;
use Contao\CoreBundle\DependencyInjection\Attribute\AsHook;
use Contao\StringUtil;
use Contao\Template;
use Doctrine\DBAL\ArrayParameterType;
use Doctrine\DBAL\Connection;
use Doctrine\DBAL\ParameterType;
use Psr\Log\LoggerInterface;
#[AsHook('parseTemplate', method: 'onParseTemplate')]
class OrganizationListingTemplateDataListener
{
public function __construct(
private readonly Connection $connection,
private readonly ?LoggerInterface $logger = null,
) {
}
public function onParseTemplate(Template $template): void
{
if ('list_default_organisationen' !== (string) $template->getName()) {
return;
}
$tbody = $template->tbody;
if (!\is_array($tbody) || [] === $tbody) {
return;
}
$rowToOrganizationIdMap = [];
foreach ($tbody as $rowIndex => $row) {
if (!\is_array($row)) {
continue;
}
$organizationId = $this->extractOrganizationId($row);
if ($organizationId > 0) {
$rowToOrganizationIdMap[(int) $rowIndex] = $organizationId;
}
}
if ([] === $rowToOrganizationIdMap) {
return;
}
$organizationIds = array_values(array_unique(array_values($rowToOrganizationIdMap)));
$organizationTagMap = $this->fetchOrganizationTagMap($organizationIds);
$organizationLogoUuidMap = $this->fetchOrganizationLogoUuidMap($organizationIds);
$organizationTagLabelMap = [];
$rowTagIdsList = [];
foreach ($organizationTagMap as $tagData) {
foreach (($tagData['ids'] ?? []) as $index => $tagId) {
$label = trim((string) (($tagData['labels'][$index] ?? '') ?: ''));
if ('' !== $tagId && '' !== $label && !isset($organizationTagLabelMap[(string) $tagId])) {
$organizationTagLabelMap[(string) $tagId] = $label;
}
}
}
foreach ($rowToOrganizationIdMap as $rowIndex => $organizationId) {
if (!isset($tbody[$rowIndex]) || !\is_array($tbody[$rowIndex])) {
continue;
}
$tagData = $organizationTagMap[$organizationId] ?? ['ids' => [], 'labels' => []];
$logoUuid = $organizationLogoUuidMap[$organizationId] ?? '';
$tagIdsCsv = implode(',', $tagData['ids']);
$tagLabelsCsv = implode(', ', $tagData['labels']);
$tbody[$rowIndex]['tag_ids']['content'] = $tagIdsCsv;
$tbody[$rowIndex]['tag_labels']['content'] = $tagLabelsCsv;
$tbody[$rowIndex]['tags']['content'] = $tagLabelsCsv;
if ('' !== $logoUuid) {
$tbody[$rowIndex]['logo_uuid']['content'] = $logoUuid;
}
}
foreach ($tbody as $rowIndex => $row) {
if (!\is_array($row)) {
$rowTagIdsList[] = '';
continue;
}
$organizationId = $rowToOrganizationIdMap[(int) $rowIndex] ?? 0;
$rowTagIdsList[] = ($organizationId > 0 && isset($organizationTagMap[$organizationId]))
? implode(',', $organizationTagMap[$organizationId]['ids'] ?? [])
: '';
}
if (null !== $this->logger) {
$rowsWithoutTagIds = 0;
foreach ($rowToOrganizationIdMap as $organizationId) {
if (!isset($organizationTagMap[$organizationId]) || [] === ($organizationTagMap[$organizationId]['ids'] ?? [])) {
++$rowsWithoutTagIds;
}
}
if ($rowsWithoutTagIds > 0) {
$this->logger->warning('Organization listing enrichment found rows without tag IDs.', [
'template' => (string) $template->getName(),
'totalRows' => \count($tbody),
'mappedRows' => \count($rowToOrganizationIdMap),
'rowsWithoutTagIds' => $rowsWithoutTagIds,
]);
}
}
$template->organization_tag_label_map = $organizationTagLabelMap;
$template->organization_row_tag_ids_list = $rowTagIdsList;
$template->tbody = $tbody;
}
/** @param array<string, mixed> $row */
private function extractOrganizationId(array $row): int
{
foreach (['id', 'organization_id', 'org_id'] as $fieldName) {
if (isset($row[$fieldName]) && \is_scalar($row[$fieldName]) && ctype_digit((string) $row[$fieldName])) {
return (int) $row[$fieldName];
}
$value = $this->extractRowFieldContent($row, $fieldName);
if ('' !== $value && ctype_digit($value)) {
return (int) $value;
}
}
foreach ($row as $column) {
if (!\is_array($column)) {
continue;
}
foreach (['url', 'href'] as $urlField) {
if (!isset($column[$urlField]) || !\is_scalar($column[$urlField])) {
continue;
}
$organizationId = $this->extractIdFromUrl((string) $column[$urlField]);
if ($organizationId > 0) {
return $organizationId;
}
}
}
return 0;
}
/** @param array<string, mixed> $row */
private function extractRowFieldContent(array $row, string $fieldName): string
{
if (!isset($row[$fieldName])) {
return '';
}
if (\is_scalar($row[$fieldName])) {
return trim((string) $row[$fieldName]);
}
if (!\is_array($row[$fieldName])) {
return '';
}
$field = $row[$fieldName];
if (!isset($field['content']) || !\is_scalar($field['content'])) {
return '';
}
return trim((string) $field['content']);
}
private function extractIdFromUrl(string $url): int
{
$parts = parse_url($url);
if (!\is_array($parts) || !isset($parts['query'])) {
return 0;
}
parse_str((string) $parts['query'], $query);
foreach (['show', 'id'] as $queryKey) {
if (!isset($query[$queryKey])) {
continue;
}
$value = $query[$queryKey];
if (\is_scalar($value) && ctype_digit((string) $value)) {
return (int) $value;
}
}
return 0;
}
/** @param list<int> $organizationIds
* @return array<int, array{ids: list<string>, labels: list<string>}>
*/
private function fetchOrganizationTagMap(array $organizationIds): array
{
if ([] === $organizationIds) {
return [];
}
$rows = $this->connection->executeQuery(
'SELECT r.pid AS organization_id, r.tag_id, t.tag AS label
FROM tl_tags_rel r
INNER JOIN tl_tags t ON t.id = r.tag_id
WHERE r.ptable = ? AND r.field = ? AND r.pid IN (?)
ORDER BY r.pid ASC, r.tag_id ASC',
['tl_organization', 'tags', $organizationIds],
[ParameterType::STRING, ParameterType::STRING, ArrayParameterType::INTEGER],
)->fetchAllAssociative();
if ([] === $rows) {
$rows = $this->connection->executeQuery(
'SELECT r.pid AS organization_id, r.tag_id, t.tag AS label
FROM tl_tags_rel r
INNER JOIN tl_tags t ON t.id = r.tag_id
WHERE r.ptable = ? AND r.pid IN (?)
ORDER BY r.pid ASC, r.tag_id ASC',
['tl_organization', $organizationIds],
[ParameterType::STRING, ArrayParameterType::INTEGER],
)->fetchAllAssociative();
}
$map = [];
$seen = [];
foreach ($rows as $row) {
$organizationId = (int) ($row['organization_id'] ?? 0);
$tagId = (int) ($row['tag_id'] ?? 0);
$label = trim((string) ($row['label'] ?? ''));
if ($organizationId <= 0 || $tagId <= 0 || '' === $label || isset($seen[$organizationId][$tagId])) {
continue;
}
$seen[$organizationId][$tagId] = true;
$map[$organizationId]['ids'][] = (string) $tagId;
$map[$organizationId]['labels'][] = $label;
}
foreach ($map as $organizationId => $tagData) {
$map[$organizationId]['ids'] = array_values(array_unique($tagData['ids'] ?? []));
$map[$organizationId]['labels'] = array_values(array_unique($tagData['labels'] ?? []));
}
return $map;
}
/** @param list<int> $organizationIds
* @return array<int, string>
*/
private function fetchOrganizationLogoUuidMap(array $organizationIds): array
{
if ([] === $organizationIds) {
return [];
}
$rows = $this->connection->executeQuery(
'SELECT o.id AS organization_id, o.logo AS logo_uuid FROM tl_organization o WHERE o.id IN (?)',
[$organizationIds],
[ArrayParameterType::INTEGER],
)->fetchAllAssociative();
$map = [];
foreach ($rows as $row) {
$organizationId = (int) ($row['organization_id'] ?? 0);
$logoUuid = $this->normalizeUuid($row['logo_uuid'] ?? null);
if ($organizationId <= 0 || '' === $logoUuid) {
continue;
}
$map[$organizationId] = $logoUuid;
}
return $map;
}
private function normalizeUuid(mixed $value): string
{
if (null === $value) {
return '';
}
if (\is_resource($value)) {
$value = stream_get_contents($value) ?: '';
}
$trimmed = trim((string) $value);
if ('' === $trimmed) {
return '';
}
if (preg_match('/^[0-9a-fA-F-]{36}$/', $trimmed)) {
return strtolower($trimmed);
}
if (16 === strlen($trimmed)) {
return StringUtil::binToUuid($trimmed);
}
return '';
}
}