From ec9c140ba2e1a7002c88074d8e799f4c02e71c79 Mon Sep 17 00:00:00 2001
From: Pontoporeia <pontoporeia@happyngreen.fr>
Date: Fri, 10 Jul 2026 12:55:58 +0200
Subject: [PATCH] repertoire: HTMX OOB swaps for filter columns + fix fading
 edge cases

Switch from swapping the entire #repertoire-index block to targeted
hx-swap-oob swaps: only the <ul> list elements are replaced, while
section headers and accordion chrome stay in the DOM untouched.

- Filter column <ul>s get IDs (rep-list-years, rep-list-ap, etc.)
  and render with hx-swap-oob=true on HTMX requests
- Students <ul> gets id=rep-students as main swap target
- Filter buttons now target #rep-students instead of #repertoire-index
- Server sets $isOob=true when rendering HTMX partial responses
- Accordion re-init on swap no longer needed (headers never replaced)
- Scroll-restore updated to capture/restore per <ul> ID

Fading fixes:
- Restore rep-entry--faded class with simplified logic: any active
  filter fades entries whose matched flag is false (removed the
  $colHasMatch gate that prevented fading when a column had no matches)
- Add $noResults guard: when matched_ids is empty (zero theses match
  all active filters), force-fade all non-selected entries across ALL
  columns. This covers the keyword edge case where per-column matched
  is computed excluding the keyword filter (many-to-many), causing
  keywords to appear valid even though the full intersection is empty.
---
 app/public/assets/css/repertoire.css          |   7 +
 .../js/app/repertoire-scroll-restore.js       |  45 +++---
 app/src/Controllers/SearchController.php      |   1 +
 app/templates/partials/repertoire-index.php   | 128 ++++++++++++------
 4 files changed, 113 insertions(+), 68 deletions(-)

diff --git a/app/public/assets/css/repertoire.css b/app/public/assets/css/repertoire.css
index eb90288..4df4760 100644
--- a/app/public/assets/css/repertoire.css
+++ b/app/public/assets/css/repertoire.css
@@ -359,6 +359,13 @@
   color: var(--accent-primary);
 }
 
+/* Faded/disabled: no valid results for this filter combination */
+.rep-entry--faded {
+  opacity: 0.3;
+  cursor: not-allowed;
+  pointer-events: none;
+}
+
 /* Years column — big numbers, semi-bold (BBBDMSans Medium weight) */
 .repertoire-col[data-col="years"] .rep-entry {
   font-size: var(--step-3);
diff --git a/app/public/assets/js/app/repertoire-scroll-restore.js b/app/public/assets/js/app/repertoire-scroll-restore.js
index 84d5482..5e32e97 100644
--- a/app/public/assets/js/app/repertoire-scroll-restore.js
+++ b/app/public/assets/js/app/repertoire-scroll-restore.js
@@ -1,52 +1,39 @@
 /**
- * repertoire-scroll-restore.js — Preserve column scroll positions on HTMX swap.
+ * repertoire-scroll-restore.js — Preserve column scroll positions on HTMX OOB swap.
  *
- * When a filter button triggers an HTMX swap that replaces #repertoire-index,
- * the new markup replaces the old, resetting all column scroll positions to 0.
- * This module captures scrollTop of each scrollable <ul> before the swap and
- * restores it after, keyed by data-col attribute so the mapping survives
- * DOM replacement.
+ * Filter clicks trigger HTMX requests that swap individual <ul> elements via
+ * hx-swap-oob. This module captures scrollTop of all rep-list-* <ul>s and the
+ * students <ul> before the request and restores them after the response settles.
  */
 (() => {
-	var INDEX_SEL = "#repertoire-index";
+	var LIST_SEL = "ul[id^='rep-list-'], ul#rep-students";
 	var scrollSnapshots = {};
 
 	function snapshot() {
-		var index = document.querySelector(INDEX_SEL);
-		if (!index) return;
 		scrollSnapshots = {};
-		index.querySelectorAll(".repertoire-col[data-col] > ul").forEach((ul) => {
-			var col = ul.closest(".repertoire-col");
-			if (!col) return;
-			var key = col.getAttribute("data-col");
-			scrollSnapshots[key] = ul.scrollTop;
+		document.querySelectorAll(LIST_SEL).forEach((ul) => {
+			scrollSnapshots[ul.id] = ul.scrollTop;
 		});
 	}
 
 	function restore() {
-		var index = document.querySelector(INDEX_SEL);
-		if (!index) return;
-		index.querySelectorAll(".repertoire-col[data-col] > ul").forEach((ul) => {
-			var col = ul.closest(".repertoire-col");
-			if (!col) return;
-			var key = col.getAttribute("data-col");
-			if (scrollSnapshots[key] !== undefined) {
-				ul.scrollTop = scrollSnapshots[key];
+		document.querySelectorAll(LIST_SEL).forEach((ul) => {
+			if (scrollSnapshots[ul.id] !== undefined) {
+				ul.scrollTop = scrollSnapshots[ul.id];
 			}
 		});
 	}
 
-	// Capture scroll positions before the outgoing element is replaced
-	document.body.addEventListener("htmx:beforeSwap", (e) => {
-		if (e.detail.target?.matches?.(INDEX_SEL)) {
+	// Capture before any HTMX request targeting rep-students
+	document.body.addEventListener("htmx:beforeRequest", (e) => {
+		if (e.detail.target?.id === "rep-students") {
 			snapshot();
 		}
 	});
 
-	// Restore after the new content is in the DOM
-	document.body.addEventListener("htmx:afterSwap", (e) => {
-		if (e.detail.target?.matches?.(INDEX_SEL)) {
-			// Use requestAnimationFrame to ensure layout has settled
+	// Restore after the response has settled into the DOM
+	document.body.addEventListener("htmx:afterSettle", (e) => {
+		if (e.detail.target?.id === "rep-students") {
 			requestAnimationFrame(() => {
 				restore();
 			});
diff --git a/app/src/Controllers/SearchController.php b/app/src/Controllers/SearchController.php
index 017c359..fd06a03 100644
--- a/app/src/Controllers/SearchController.php
+++ b/app/src/Controllers/SearchController.php
@@ -277,6 +277,7 @@ class SearchController
         array $repData,
         array $activeFilters,
     ): never {
+        $isOob = true;
         header('Content-Type: text/html; charset=UTF-8');
         include APP_ROOT . '/templates/partials/repertoire-index.php';
         exit();
diff --git a/app/templates/partials/repertoire-index.php b/app/templates/partials/repertoire-index.php
index 6892d06..96bb4eb 100644
--- a/app/templates/partials/repertoire-index.php
+++ b/app/templates/partials/repertoire-index.php
@@ -3,11 +3,17 @@
  * Partial: répertoire index columns.
  * Rendered both on full page load and as HTMX partial swap.
  *
+ * When $isOob is true, renders only <ul> elements with hx-swap-oob attributes
+ * for the filter columns, and the students <ul> as the main swap target.
+ *
  * Expected variables:
- *   $repData       array  output of Database::getRepertoireFilterData()
- *   $activeFilters array{years:int[], ap:string[], or:string[], fi:string[], kw:string[]}
+ *   $repData        array  output of Database::getRepertoireFilterData()
+ *   $activeFilters  array{years:int[], ap:string[], or:string[], fi:string[], kw:string[]}
+ *   $isOob          bool   (optional) render OOB-only response for HTMX swaps
  */
 
+$isOob = $isOob ?? false;
+
 $activeSets = [
     'years' => array_map('strval', $activeFilters['years'] ?? []),
     'ap'    => $activeFilters['ap'] ?? [],
@@ -58,60 +64,45 @@ function repToggleUrl(array $sets, string $dim, string $value): string {
     return '/repertoire' . ($qs ? '?' . $qs : '');
 }
 
+/**
+ * Render a single filter entry <li>.
+ *
+ * Fading logic: when any filter is active, entries that would yield zero
+ * results (matched=false) are faded and disabled. The selected entry itself
+ * is never faded.
+ */
 function repFilterEntry(
     array $item,
     string $dim,
     array $activeSets,
+    bool $anyActive,
+    bool $noResults,
     string $hx,
 ): void {
     $val      = (string)$item['value'];
     $isActive = in_array($val, $activeSets[$dim], true);
+    $isFaded  = $anyActive && ($noResults || !$item['matched']) && !$isActive;
     $cls      = 'rep-entry'
-              . ($isActive ? ' rep-entry--selected' : '');
+              . ($isActive ? ' rep-entry--selected' : '')
+              . ($isFaded  ? ' rep-entry--faded'    : '');
     $url      = repToggleUrl($activeSets, $dim, $val);
 ?>
             <li>
                 <button type="button" class="<?= $cls ?>"
                         aria-pressed="<?= $isActive ? 'true' : 'false' ?>"
-                        hx-get="<?= htmlspecialchars($url) ?>" <?= $hx ?>>
+                        <?= $isFaded ? 'disabled' : "hx-get=\"" . htmlspecialchars($url) . "\" $hx" ?>>
                     <?= htmlspecialchars($dim === 'ap' ? formatApDisplay($val) : $val) ?>
                 </button>
             </li>
 <?php
 }
 
-// ── Column definitions ──────────────────────────────────────────────────────
-$hx = 'hx-target="#repertoire-index" hx-swap="outerHTML" hx-push-url="true" hx-indicator="#rep-indicator"';
-
-$filterColumns = [
-    ['dataKey' => 'years',          'dim' => 'years', 'heading' => 'Années'],
-    ['dataKey' => 'ap_programs',    'dim' => 'ap',    'heading' => 'Ateliers Pluridisciplinaires'],
-    ['dataKey' => 'orientations',   'dim' => 'or',    'heading' => 'Orientations'],
-    ['dataKey' => 'finality_types', 'dim' => 'fi',    'heading' => 'Finalité du&nbsp;Master'],
-    ['dataKey' => 'keywords',       'dim' => 'kw',    'heading' => 'Mots-clés'],
-];
-
+/**
+ * Render the students <ul> (no section chrome).
+ */
+function renderStudentsList(array $studentWorks): void {
 ?>
-<div id="repertoire-index" class="repertoire-index">
-
-<?php
-// Render filter columns in the correct left-to-right order.
-// Students column (non-filter) is inserted between keywords and AP/or/fi/years.
-$renderOrder = ['years', 'ap', 'or', 'fi', 'students', 'kw'];
-
-foreach ($renderOrder as $colKey):
-    if ($colKey === 'students'): ?>
-    <!-- ÉTUDIANTES -->
-    <section class="repertoire-col rep-accordion" data-col="students">
-        <h2>
-            <span class="rep-accordion__heading-text">Étudiant·es</span>
-            <button type="button" class="rep-accordion__toggle" aria-expanded="false">
-                Étudiant·es
-                <span class="rep-accordion__chevron" aria-hidden="true"></span>
-            </button>
-        </h2>
-        <div class="rep-accordion__panel">
-        <ul>
+        <ul id="rep-students">
         <?php if (empty($studentWorks)): ?>
             <li class="rep-empty">—</li>
         <?php else: ?>
@@ -135,13 +126,72 @@ foreach ($renderOrder as $colKey):
             <?php endforeach; ?>
         <?php endif; ?>
         </ul>
+<?php
+}
+
+// ── Column definitions ──────────────────────────────────────────────────────
+$hx = 'hx-target="#rep-students" hx-swap="outerHTML" hx-push-url="true" hx-indicator="#rep-indicator"';
+
+$anyActive = !empty($activeSets['years']) || !empty($activeSets['ap'])
+          || !empty($activeSets['or'])    || !empty($activeSets['fi'])
+          || !empty($activeSets['kw']);
+
+$noResults = $anyActive && empty($repData['matched_ids']);
+
+$filterColumns = [
+    ['dataKey' => 'years',          'dim' => 'years', 'heading' => 'Années'],
+    ['dataKey' => 'ap_programs',    'dim' => 'ap',    'heading' => 'Ateliers Pluridisciplinaires'],
+    ['dataKey' => 'orientations',   'dim' => 'or',    'heading' => 'Orientations'],
+    ['dataKey' => 'finality_types', 'dim' => 'fi',    'heading' => 'Finalité du&nbsp;Master'],
+    ['dataKey' => 'keywords',       'dim' => 'kw',    'heading' => 'Mots-clés'],
+];
+
+// Render order: students column is inserted between fi and kw
+$renderOrder = ['years', 'ap', 'or', 'fi', 'students', 'kw'];
+
+// ── OOB response: only <ul> elements, no section chrome ─────────────────────
+if ($isOob):
+    foreach ($renderOrder as $colKey):
+        if ($colKey === 'students'):
+            renderStudentsList($studentWorks);
+        else:
+            $col = array_values(array_filter($filterColumns, fn($c) => $c['dim'] === $colKey))[0];
+            $listId = 'rep-list-' . $colKey;
+?>
+        <ul id="<?= $listId ?>" hx-swap-oob="true">
+<?php       foreach ($repData[$col['dataKey']] as $item):
+                repFilterEntry($item, $col['dim'], $activeSets, $anyActive, $noResults, $hx);
+            endforeach; ?>
+        </ul>
+<?php   endif;
+    endforeach;
+    return; // renderRepertoirePartial will exit() after include
+endif;
+
+// ── Full page load ──────────────────────────────────────────────────────────
+?>
+<div id="repertoire-index" class="repertoire-index">
+
+<?php
+foreach ($renderOrder as $colKey):
+    if ($colKey === 'students'): ?>
+    <!-- ÉTUDIANTES -->
+    <section class="repertoire-col rep-accordion" data-col="students">
+        <h2>
+            <span class="rep-accordion__heading-text">Étudiant·es</span>
+            <button type="button" class="rep-accordion__toggle" aria-expanded="false">
+                Étudiant·es
+                <span class="rep-accordion__chevron" aria-hidden="true"></span>
+            </button>
+        </h2>
+        <div class="rep-accordion__panel">
+<?php   renderStudentsList($studentWorks); ?>
         </div>
     </section>
 <?php else:
         $col = array_values(array_filter($filterColumns, fn($c) => $c['dim'] === $colKey))[0];
-
-        // Count active filters in this column for the badge
         $activeCount = count($activeSets[$col['dim']]);
+        $listId = 'rep-list-' . $colKey;
         ?>
     <section class="repertoire-col rep-accordion" data-col="<?= $col['dim'] ?>">
         <h2>
@@ -155,9 +205,9 @@ foreach ($renderOrder as $colKey):
             </button>
         </h2>
         <div class="rep-accordion__panel">
-        <ul>
+        <ul id="<?= $listId ?>">
 <?php   foreach ($repData[$col['dataKey']] as $item):
-            repFilterEntry($item, $col['dim'], $activeSets, $hx);
+            repFilterEntry($item, $col['dim'], $activeSets, $anyActive, $noResults, $hx);
         endforeach; ?>
         </ul>
         </div>