Fix discipline filters across scope changes

Author: avermue

index.html

@@ -14,12 +14,12 @@
       if (legacy === 'IT')         scope = ['IT'];
       else if (legacy === 'INRAE') scope = ['INRAE'];
       else if (legacy === 'BOTH')  scope = [];          // legacy union → ALL
-      else                         scope = ['IT'];       // default
+      else                         scope = [];           // default: ALL
     }
     var hasIT = scope.indexOf('IT') >= 0, hasIN = scope.indexOf('INRAE') >= 0;
     var mode = (hasIT && hasIN) ? 'BOTH' : hasIT ? 'IT' : hasIN ? 'INRAE' : 'ALL';
     document.documentElement.classList.add('mode-' + mode);
-  } catch(e) { document.documentElement.classList.add('mode-IT'); }
+  } catch(e) { document.documentElement.classList.add('mode-ALL'); }
 </script>
 <link rel="preconnect" href="https://fonts.googleapis.com">
 <link href="https://fonts.googleapis.com/css2?family=Spectral:ital,wght@0,400;0,600;1,400&family=Fira+Code:wght@400;500&family=Lato:wght@300;400;700&display=swap" rel="stylesheet">
@@ -381,7 +381,7 @@
               <dd>Each project's EU contribution (for the active scope) is distributed evenly over its duration. A project spanning 3.5 years with €700k contribution yields ~€200k/year. Years partially covered receive a proportional share. This allows meaningful cross-year comparisons despite uneven project starts and ends.</dd>
 
               <dt>Scope filter (IT / INRAE)</dt>
-              <dd>The <strong>Scope</strong> filter in the left sidebar controls which projects are visible. <strong>IT only</strong> (default): projects where INRAE Transfert SAS is a partner. <strong>INRAE only</strong>: projects where the broader INRAE research institute participates (typically a much larger portfolio). <strong>Both checked</strong>: only projects shared by IT and INRAE (intersection). <strong>Neither checked</strong>: every project involving either entity (union of all). When both or neither are selected, budget figures are summed (IT + INRAE combined). Each project's card shows up to three budget chips: total EU budget, IT contribution, INRAE contribution — only the relevant ones are displayed.</dd>
+              <dd>The <strong>Scope</strong> filter in the left sidebar controls which projects are visible. <strong>IT only</strong>: projects where INRAE Transfert SAS is a partner. <strong>INRAE only</strong>: projects where the broader INRAE research institute participates (typically a much larger portfolio). <strong>Both checked</strong>: only projects shared by IT and INRAE (intersection). <strong>Neither checked</strong> (default): every project involving either entity (union of all). When both or neither are selected, budget figures are summed (IT + INRAE combined). Each project's card shows up to three budget chips: total EU budget, IT contribution, INRAE contribution — only the relevant ones are displayed.</dd>
 
               <dt>FP7 → funding type mapping</dt>
               <dd>FP7 funding scheme codes are normalised to categories equivalent to H2020/HE types to enable cross-programme budget breakdowns. Mappings include: <code>CP</code>, <code>CP-TP</code>, <code>CP-IP</code> → RIA · <code>CP-*-SICA</code> → RIA · <code>MC-*</code> (Marie Curie) → MSCA · <code>ERC-*</code> → ERC · <code>BSG-SME*</code> → EIC · <code>NoE</code> (Networks of Excellence) → CSA · <code>HORIZON-AG/PARC</code> → COFUND.</dd>

js/app.js

@@ -3,12 +3,12 @@
    ══════════════════════════════════════════════════════════════ */
 
 let ALL = [], VISIBLE_PROJECTS = [], FILTERED = [];
-let FILTERS = { scope: new Set(['IT']), programme: new Set(), itRole: new Set(), inraeRole: new Set(), schemeGroup: new Set(), status: new Set(), country: new Set() };
+let FILTERS = { scope: new Set(), programme: new Set(), itRole: new Set(), inraeRole: new Set(), schemeGroup: new Set(), status: new Set(), country: new Set() };
 let SEARCH = '', SORT = 'startDate-desc';
 let DOMAIN_FILTERS = [], DOMAIN_OPERATOR = 'OR';
 let REGION_FILTER = null, PARTNER_FILTER = null, PARTNER_PAGE = 0;
 let CHARTS = {};
-let VIEW_MODE = 'IT';   // derived from FILTERS.scope: 'IT' | 'INRAE' | 'BOTH' (intersection) | 'ALL' (union)
+let VIEW_MODE = 'ALL';  // derived from FILTERS.scope: 'IT' | 'INRAE' | 'BOTH' (intersection) | 'ALL' (union)
 
 function destroyChart(id) { if (CHARTS[id]) { CHARTS[id].destroy(); delete CHARTS[id]; } }
 
@@ -35,6 +35,10 @@ function applyViewMode({ rebuild = true } = {}) {
   if (rebuild) {
     delete window._domDescendants;
     delete window._domToIds;
+    delete window._filteredPkeys;
+    delete window._nodeFilteredCount;
+    if (typeof _domTree !== 'undefined') _domTree = null;
+    if (typeof _donutDrillNode !== 'undefined') _donutDrillNode = null;
     buildKPIs();
     buildSidebar();
     apply();
@@ -88,7 +92,7 @@ async function load() {
         if (legacy === 'IT')         scope = ['IT'];
         else if (legacy === 'INRAE') scope = ['INRAE'];
         else if (legacy === 'BOTH')  scope = [];        // legacy union → ALL
-        else                         scope = ['IT'];     // default
+        else                         scope = [];         // default: ALL
       }
       FILTERS.scope = new Set(scope);
     } catch (e) {}
@@ -166,13 +170,16 @@ function apply() {
       }
     }
     if (DOMAIN_FILTERS.length) {
-      const getDescendantIds = df => {
-        if (window._domDescendants && window._domDescendants[df.key]) return window._domDescendants[df.key];
-        return null;
-      };
       const matchDomain = df => {
-        const ids = getDescendantIds(df);
+        const ids = window._domDescendants && window._domDescendants[df.key];
         if (ids && ids.size > 0) return ids.has(p.id + '|' + p.programme);
+        const selectedPath = (df.path && df.path.length ? df.path : (df.key || '').split('|||')).filter(Boolean);
+        const hasPathMatch = (p.euroSciVoc || []).some(sv => {
+          const parts = (sv.path || '').trim('/').split('/').map(x => x.trim()).filter(Boolean);
+          return selectedPath.length && selectedPath.every((seg, i) => parts[i] === seg);
+        });
+        if (hasPathMatch) return true;
+        if (selectedPath.length === 1 && projectCats(p, 'l1').some(c => c === selectedPath[0])) return true;
         const exactIds = window._domToIds && window._domToIds[df.name];
         if (exactIds && exactIds.size > 0) return exactIds.has(p.id + '|' + p.programme);
         return projectCats(p).some(c => c === df.name);
@@ -346,7 +353,7 @@ function bindEvents() {
     SEARCH = ''; SORT = 'startDate-desc'; DOMAIN_FILTERS = []; DOMAIN_OPERATOR = 'OR';
     REGION_FILTER = null; PARTNER_FILTER = null;
     Object.values(FILTERS).forEach(s => s.clear());
-    FILTERS.scope = new Set(['IT']);   // restore default scope
+    FILTERS.scope = new Set();         // restore default scope: ALL
     persistScope();
     document.getElementById('search').value = '';
     document.getElementById('sort').value = 'startDate-desc';