Skip to content

Navigation Menu

Appearance settings

View all features
- BY COMPANY SIZE
  Enterprises
  Small and medium teams
  Startups
  Nonprofits
- BY USE CASE
  App Modernization
  DevSecOps
  DevOps
  CI/CD
  View all use cases
- BY INDUSTRY
  Healthcare
  Financial services
  Manufacturing
  Government
  View all industries
View all solutions
- EXPLORE BY TOPIC
  AI
  Software Development
  DevOps
  Security
  View all topics
- EXPLORE BY TYPE
  Customer stories
  Events & webinars
  Ebooks & reports
  Business insights
  GitHub Skills
- SUPPORT & SERVICES
  Documentation
  Customer support
  Community forum
  Trust center
  Partners
View all resources
- COMMUNITY
  GitHub SponsorsFund open source developers
- PROGRAMS
  Security Lab
  Maintainer Community
  GitHub Stars
  Archive Program
- REPOSITORIES
  Topics
  Trending
  Collections
- ENTERPRISE SOLUTIONS
  Enterprise platformAI-powered developer platform
- AVAILABLE ADD-ONS
  GitHub Advanced SecurityEnterprise-grade security features
  Copilot for BusinessEnterprise-grade AI features
  Premium SupportEnterprise-grade 24/7 support
Pricing

Appearance settings

You signed in with another tab or window. Reload to refresh your session. You signed out in another tab or window. Reload to refresh your session. You switched accounts on another tab or window. Reload to refresh your session.

Dismiss alert

dhis2 / maps-app Public

Notifications You must be signed in to change notification settings
Fork 13
Star 20

Code
Issues
Pull requests 30
Actions
Security and quality
Insights

Additional navigation options

Code
Issues
Pull requests
Actions
Security and quality
Insights

feat: add Combined (multilayer) data table [superseded] - #3741

#3741

Draft

BRaimbault wants to merge 205 commits into

feat/datatable-pr6-new-filtersdhis2/maps-app:feat/datatable-pr6-new-filtersfrom

feat/datatable-pr7-multilayerdhis2/maps-app:feat/datatable-pr7-multilayerCopy head branch name to clipboard

Conversation Commits205 (205)Checks Files changed

Draft

feat: add Combined (multilayer) data table [superseded]#3741
BRaimbault wants to merge 205 commits into
feat/datatable-pr6-new-filtersfrom
feat/datatable-pr7-multilayer

Commits

Commits on Sep 1, 2026

chore: add Claude Code project config with hooks and MCP servers
BRaimbault
authored
48b2744
chore: add Claude Code tooling for maps-app
BRaimbault
authored
e1f4734
chore: create and use replica accounts in CI
BRaimbault
authored
2c72f01
chore: remove arbitrary cy.wait
BRaimbault
authored
929b314
chore: update e2eReplicaAccount.js
BRaimbault
authored
e5f6846
feat: add DATA_FILTERS_CLEAR_ALL action and reducer case

BRaimbault
and
claude
authored
690090c
feat: expose totalCount and filteredCount from useTableData

BRaimbault
and
claude
authored
f364871
feat: redesign BottomPanel dataTableControls as 36px toolbar

BRaimbault
and
claude
authored
4cb9459
feat: zoom map to feature on data table row click

BRaimbault
and
claude
authored
2748537
feat: add toolbar, row context menu, and fix highlight persistence
BRaimbault
authored
cf83714
chore: sonarqube fixes
BRaimbault
authored
16f8761
chore: update cypress tests
BRaimbault
authored
4ecf34d
chore: update cypress tests
BRaimbault
authored
262dacd
chore: sonarqube issues fix
BRaimbault
authored
d0a2188
chore: create and use replica accounts in CI
BRaimbault
authored
2d12943
chore: sonarqube issues
BRaimbault
authored
49ab3c0
feat: add bidirectional map/table selection sync and collapsible data table
BRaimbault
authored
f2b3f92
fix: bump maps-gl
BRaimbault
authored
b2161ea
chore: sonarqube issues
BRaimbault
authored
392805a
chore: cypress tests update
BRaimbault
authored
20e047b
chore: sonarqube issues
BRaimbault
authored
49a1984
chore: fix cypress tests
BRaimbault
authored
cc11f54
chore: sonarqube issues fix
BRaimbault
authored
6d9fa0b
feat: preserve optionSet on event layer table headers
BRaimbault
authored
f8c32cb
feat: compute columnOptions for categorical data table columns
BRaimbault
authored
20b26b0
feat: support array-valued (multi-select) filters in filterData
BRaimbault
authored
1ecec00
feat: add filterByGlobalSearch utility and thread globalSearch through useTableData
BRaimbault
authored
4b032a2
feat: add multi-select dropdown filter to FilterInput
BRaimbault
authored
e4f4ebb
feat: add numeric filter syntax help tooltip
BRaimbault
authored
b703733
feat: pass columnOptions and optionSet through DataTable to FilterInput
BRaimbault
authored
bcb2326
feat: add global search box to data table toolbar
BRaimbault
authored
071c6f2
feat: wire legend item clicks to pre-populate data table filter
BRaimbault
authored
da9c11a
chore: fix lint/prettier issues in PR3 files
BRaimbault
authored
5dc740c
fix: toolbar polish - clear filters button, search sizing, collapse icon/bug
BRaimbault
authored
c4218fe
feat: round out data table filtering with reverse-selection, zoom-to-filtered, and a richer selection filter
BRaimbault
authored
09b7087
revert: remove legend-click-to-filter, deferred to a future PR
BRaimbault
authored
6a1fcba
chore: sonarqube issues
BRaimbault
authored
954d42e
chore: sonarqube issues
BRaimbault
authored
f9f22ce
chore: sonarqube issue
BRaimbault
authored
62d0b31
fix: handle narrow columns and hide index column
BRaimbault
authored
757a19b
fix: rollback merging range and color columns
BRaimbault
authored
11604ed
chore: PR clean-up
BRaimbault
authored
3b282b5
chore: sonarqube issues
BRaimbault
authored
faa0a7b
fix: properly format dropdown numeric values
BRaimbault
authored
5f49e1b
chore: fix cypress tests
BRaimbault
authored
bf4c5fa
chore: cypress test fix
BRaimbault
authored
7e0bc73
chore: cypress test fix
BRaimbault
authored
57a520a
chore: cypress test fix
BRaimbault
authored
f3ecf06
chore: create and use replica accounts in CI
BRaimbault
authored
3dd5d74
chore: update e2eReplicaAccount.js
BRaimbault
authored
3ef2c71
feat: add toolbar, row context menu, and fix highlight persistence
BRaimbault
authored
31db3e6
feat: add bidirectional map/table selection sync and collapsible data table
BRaimbault
authored
759b54d
fix: toolbar polish - clear filters button, search sizing, collapse icon/bug
BRaimbault
authored
940bd84
feat: round out data table filtering with reverse-selection, zoom-to-filtered, and a richer selection filter
BRaimbault
authored
dc0e3d7
chore: PR clean-up
BRaimbault
authored
ff32bb4
feat: add DATA_TABLE_COLUMN_CONFIG_SET reducer action and persistence plumbing
BRaimbault
authored
9ba799b
feat: add pure column visibility/order/pin computation
BRaimbault
authored
8d73544
feat: wire column visibility/pin/order into DataTable rendering
BRaimbault
authored
a7a296f
feat: add ColumnPicker component for show/hide, pin, and reorder
BRaimbault
authored
f4d36dd
test: add coverage for dataTableColumnConfig persistence and ColumnPicker
BRaimbault
authored
cbe7ee2
chore: extract i18n strings for ColumnPicker
BRaimbault
authored
b456a99
fix: small improvements
BRaimbault
authored
a1e51f5
chore: datatable controls refactor
BRaimbault
authored
5d495d7
fix: column picker cleanup
BRaimbault
authored
80ae27c
fix: pr cleanup
BRaimbault
authored
c0410a6
chore: fix sonarqube issues
BRaimbault
authored
3f25a5e
chore: use css module
BRaimbault
authored
c19f31e
chore: pr cleanup
BRaimbault
authored
bd6ef6c
chore: pr cleanup
BRaimbault
authored
f85a475
chore: add retry on delete
BRaimbault
authored
eac8da3
chore: update e2eReplicaAccount.js
BRaimbault
authored
f2cef16
chore: PR wrap-up
BRaimbault
authored
fa7a521
feat: add bidirectional map/table selection sync and collapsible data table
BRaimbault
authored
997a788
feat: add global search box to data table toolbar
BRaimbault
authored
525f2e6
fix: toolbar polish - clear filters button, search sizing, collapse icon/bug
BRaimbault
authored
cfa7fee
feat: round out data table filtering with reverse-selection, zoom-to-filtered, and a richer selection filter
BRaimbault
authored
3d4ffae
chore: PR clean-up
BRaimbault
authored
7bf7e33
fix: ColumnPicker permanently disabled for layer types with synchronous headers
BRaimbault
authored
e34991d
feat: support tracked entity layers in the data table
BRaimbault
authored
dbfbba1
feat: support timeline/split-by-period thematic layers in the data table
BRaimbault
authored
d85ff89
feat: add Legend/Range columns for data-item-styled event layers
BRaimbault
authored
aaeb144
feat: add Color/Icon/Group columns for group-set-styled org unit and facility layers
BRaimbault
authored
4cc1fc7
feat: add Color column for GeoJSON URL and tracked entity layers
BRaimbault
authored
b73a3e9
chore: pr cleanup
BRaimbault
authored
2dff72e
chore: sonarqube issues
BRaimbault
authored
7cbe705
chore: fix cypress test
BRaimbault
authored
c161c92
fix: datatable performance optimisation
BRaimbault
authored
e543690
chore: PR clean-up
BRaimbault
authored
d2b2cd6
chore: sonarqube issue
BRaimbault
authored
fcb310a
chore: PR clean-up
BRaimbault
authored
b4d63ca
fix datatable support geometry+multigeometry mix
BRaimbault
authored
fcb4fc0
fix: coherce numeric valueTypes in TE layer for datatable
BRaimbault
authored
a95c172
fix: no drilling and profile for TE layer
BRaimbault
authored
b4fae37
fix: cancel on resize issues
BRaimbault
authored
36fbc00
fix: raceediting filters/columns while an event layer's data is still extending
BRaimbault
authored
da30838
fix: crash + dead-code bug in parseLayerConfig
BRaimbault
authored
a5028aa
fix: header titles alignement
BRaimbault
authored
7fe8765
feat: expose spatialSupport from system info for event clustering

BRaimbault
and
claude
authored
b0ff4e0
feat: expose spatialSupport from system info in dashboard plugin

BRaimbault
and
claude
authored
93b2e44
feat: thread spatialSupport into event layer loader call sites

BRaimbault
and
claude
authored
cdf5b4b
feat: gate server-side event clustering on backend spatial support

BRaimbault
and
claude
authored
69b73f1
feat: add Redux action for forcing client-side event clustering

BRaimbault
and
claude
authored
da52d44
test: confirm forceClientCluster is never saved to favorites

BRaimbault
and
claude
authored
7df1cae
feat: reload server-clustered event layers when forceClientCluster is set

BRaimbault
and
claude
authored
218761f
feat: bypass server-cluster decision when forceClientCluster is set

BRaimbault
and
claude
authored
95e0f8c
fix: allow opening the data table on a server-clustered event layer

BRaimbault
and
claude
authored
de36edb
fix: stop hard-erroring the data table for server-clustered event layers

BRaimbault
and
claude
authored
ef42b65
feat: add in-table action to show event details for a clustered layer

BRaimbault
and
claude
authored
d21b1dd
feat: wire the show-event-details action into the data table

BRaimbault
and
claude
authored
2369c2d
fix: don't mark a server-clustered event layer's table data as ready

BRaimbault
and
claude
authored
facde24
fix: show the loaded (capped) event count in the legend, not the raw total, once rendering client-side

BRaimbault
and
claude
authored
e5dbe51
chore: PR clean-up
BRaimbault
authored
2a1f552
refactor: extract nested ternaries flagged by SonarQube

BRaimbault
and
claude
authored
8634fb2
fix: PR clean-up
BRaimbault
authored
84c1c9b
fix: PR clean-up
BRaimbault
authored
1f3ea3a
chore: sonarqube fix
BRaimbault
authored
f00285c
feat: add bidirectional map/table selection sync and collapsible data table
BRaimbault
authored
f889f5d
fix: toolbar polish - clear filters button, search sizing, collapse icon/bug
BRaimbault
authored
9ea8a24
feat: round out data table filtering with reverse-selection, zoom-to-filtered, and a richer selection filter
BRaimbault
authored
d792fc2
fix: rollback merging range and color columns
BRaimbault
authored
f93b091
feat: hierarchical drill-down filter for date/time data table columns
BRaimbault
authored
ff7e87c
feat: hierarchical drill-down filter for org unit data table columns
BRaimbault
authored
bb9b605
chore: PR clean-up
BRaimbault
authored
ac29924
chore: GroupFilterPopover refactor
BRaimbault
authored
11dc96b
chore: useGroupFilterInput refactor
BRaimbault
authored
6910c72
fix: tracked entity datatable values resolution
BRaimbault
authored
1a53993
chore: cypress tests fix
BRaimbault
authored
8f3052d
chore: fix cypress tests
BRaimbault
authored
06bbfc5
chore: PR round-up
BRaimbault
authored
23c048a
chore: PR clean-up
BRaimbault
authored
796eac2
fix: resolve org unit names using display-name setting and drop duplicate lookup fetch
BRaimbault
authored
6a6827e
fix: populate org unit hierarchy columns for rows without coordinates
BRaimbault
authored
0a1fd0d
chore: add tests
BRaimbault
authored
5586866
fix: scope selection reducer's DATA_TABLE_TOGGLE clear to its own layer
BRaimbault
authored
7996d8e
feat: rewrite dataTable reducer to multi-layer state {openIds, combinedView, joinConfig}
BRaimbault
authored
c92e674
feat: update all state.dataTable consumers for the new object shape
BRaimbault
authored
fc6c16a
feat: add tab bar to BottomPanel for multiple open data table layers
BRaimbault
authored
7f50f06
feat: add Combined tab with join-level selector and layer picker
BRaimbault
authored
7fffd2b
feat: add spatialJoin utility using existing @turf/boolean-point-in-polygon dep
BRaimbault
authored
63dbad7
feat: add useCombinedTableData hook (org unit, parent org unit, spatial joins)
BRaimbault
authored
e2db76a
feat: add CombinedDataTable component and wire into BottomPanel
BRaimbault
authored
a9fb3ed
fix: resolve org unit names in Combined view and reset stale combinedView state
BRaimbault
authored
d261147
fix: fall back to feature id when orgUnitId is absent in Combined view joins
BRaimbault
authored
2d364de
feat: extend feature/selection state with additive crossLayerIds [DHIS2-20543]
BRaimbault
authored
c2597ea
feat: expose per-row cross-layer feature ids from useCombinedTableData [DHIS2-20543]
BRaimbault
authored
d0608a3
feat: reuse buildRowCells/filterData/compareRows for Combined sorting and filtering [DHIS2-20543]
BRaimbault
authored
505c872
feat: add row selection and hover-highlight to CombinedDataTable [DHIS2-20543]
BRaimbault
authored
2e1bc05
refactor: share rendering/interaction architecture between DataTable and CombinedDataTable [DHIS2-20543]
BRaimbault
authored
6152d51
refactor: share cell value formatting between DataTable and CombinedDataTable [DHIS2-20543]
BRaimbault
authored
31076fc
feat: add pinned columns and session-only column picker to CombinedDataTable [DHIS2-20543]
BRaimbault
authored
ab6d63f
fix: forward crossLayerIds highlights to every layer they name in Map.jsx [DHIS2-20543]
BRaimbault
authored
0ffc59b
feat: add CombinedTableContextMenu with zoom and drill up/down [DHIS2-20543]
BRaimbault
authored
392c28e
fix: close remaining crossLayerIds parity gaps found in fresh-context review [DHIS2-20543]
BRaimbault
authored
9c4e345
fix: DATA_TABLE_TOGGLE no longer resets combinedView/joinConfig on last-tab-close [DHIS2-20543]
BRaimbault
authored
759aca0
fix: avoid colon in the spatial join option label (breaks i18next-scanner) [DHIS2-20543]
BRaimbault
authored
2c133d5
feat: replace data table tabs with a layer selector dropdown, add a menu-bar Data Table shortcut [DHIS2-20543]
BRaimbault
authored
5c29d0b
feat: list every eligible layer in the data table dropdown, not just open ones [DHIS2-20543]
BRaimbault
authored
0934dcc
feat: add applyAggregation utility and combined-join aggregation types [DHIS2-20543]
BRaimbault
authored
f9b83fe
feat: add the combinedTableRef layer type, wired to orgUnitLoader/OrgUnitDialog [DHIS2-20543]
BRaimbault
authored
639dcbb
feat: add hideStyleTab to OrgUnitDialog and a control to open/edit the reference layer [DHIS2-20543]
BRaimbault
authored
b2ad60a
feat: rework Combined joins around a reference org unit set [DHIS2-20543]
BRaimbault
authored
217c283
feat: persist combinedJoinConfig on the reference layer [DHIS2-20543]
BRaimbault
authored
f6f4ca8
fix: close Combined join gaps found in fresh-context review [DHIS2-20543]
BRaimbault
authored
8825a1d
fix: merge Earth Engine's aggregation values into Combined joins [DHIS2-20543]
BRaimbault
authored
43f0905
fix: various improvements
BRaimbault
authored
0992e16
fix: combined table persistance
BRaimbault
authored
a6eb9d8
chore: simplify Combined join/column config persistence
BRaimbault
authored
4079ce3
chore: PR clean-up
BRaimbault
authored
67f1bfe
chore: dropdown clean-up
BRaimbault
authored
6ff4ccf
fix: close data table filter popovers on Escape
BRaimbault
authored
b833689
fix: data table layer selector reliability fixes for Combined and no-data layers
BRaimbault
authored
2b286b2
fix: hide technical id/level/geometry columns by default, lowercase "Org unit id"
BRaimbault
authored
ab6fa1d
feat: default Combined aggregation/org units intelligently, warn on lossy joins
BRaimbault
authored
8625247
fix: small improvements
BRaimbault
authored
dc85dc6
feat: add hidden Earth Engine per-band columns to the single-layer data table
BRaimbault
authored
a2e88e9
feat: add hidden Earth Engine per-band columns to the Combined data table
BRaimbault
authored
b28cbee
chore: remove comments
BRaimbault
authored
b44bd9e
refactor: tag Combined value dataKeys with a kind (value/count/category)
BRaimbault
authored
a4fce0d
feat: add categorical/count Combined value columns for Facility/OrgUnit layers
BRaimbault
authored
a9b8149
feat: add categorical/numeric/count Combined value columns for Event layers
BRaimbault
authored
a345cd9
feat: add count-only Combined value column for TrackedEntity layers
BRaimbault
authored
3c1fc87
feat: compute count/category row values and headers in the Combined table
BRaimbault
authored
dba1187
feat: add Count/Percentage selector for categorical Combined join columns
BRaimbault
authored
83aa44e
fix: exclude non-numeric Event values from Combined value-column aggregation
BRaimbault
authored
a7d961e
chore: PR clean-up
BRaimbault
authored
cbfccd4
chore: PR clean up
BRaimbault
authored
9ddcf2b
chore: en.pot update
BRaimbault
authored
4c95eff
fix: consistent default sorting
BRaimbault
authored
b2127b9
fix: don't clear the org unit hierarchy filter on a no-match search
BRaimbault
authored
a779e28
fix: match numeric, date, and org-unit columns in data table global search
BRaimbault
authored
7428958
fix: keep feature selection when opening or closing the data table
BRaimbault
authored
a39bbee
fix: keep fixed period columns in thematic timeline data table alongside the current-period column
BRaimbault
authored
d700cff
fix: avoid stale period label for timeline columns in the data table column picker
BRaimbault
authored
756d6db
fix: support timeline/split-by-period thematic layers in the combined data table
BRaimbault
authored
4c7969f
fix: apply thousands separator to rows count
BRaimbault
authored
74a6416
fix: apply per-layer filters in the combined data table and flag when they're active
BRaimbault
authored
0d03309
feat: add collapsible rows and consistent styling to the combine-layers popover
BRaimbault
authored
c002053
fix: pin data table row highlight and remove drill up/down
BRaimbault
authored
5d2e691
fix: add warning when event layer is server clustered
BRaimbault
authored
baad9ab
fix: allow org-unit join to use reference org units with no geometry
BRaimbault
authored
a6ab462
fix: performance optimisation
BRaimbault
authored
d510af1
chore: fix tests
BRaimbault
authored
f37cb9e
chore: fix sonarqube issue
BRaimbault
authored
8875121
fix: make org-unit and date hierarchy filters work in the combined table
BRaimbault
authored
f49e3c7
fix: preserve data table tabs and selection across close/reopen
BRaimbault
authored
6f9b647

Footer

© 2026 GitHub, Inc.

Footer navigation

Terms
Privacy
Security
Status
Community
Docs
Contact

You can’t perform that action at this time.