Skip to content
Merged
Show file tree
Hide file tree
Changes from 50 commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
0c44c63
chore: restructure pivot stories
janhenrikoverland Jun 30, 2025
bb8d99a
chore: add numeric story
janhenrikoverland Jul 2, 2025
db9a296
chore: add boolean story
janhenrikoverland Jul 2, 2025
bbac5da
chore: reorder stories
janhenrikoverland Jul 2, 2025
98dce1d
chore: add yesonly story
janhenrikoverland Jul 2, 2025
4793492
chore: add optionset story WIP
janhenrikoverland Jul 30, 2025
aafc7df
chore: fns and tests for option set
janhenrikoverland Aug 1, 2025
d476f59
chore: add handler and tests for numeric
janhenrikoverland Aug 1, 2025
2f74e24
chore: add handlers and tests for all types
janhenrikoverland Aug 1, 2025
925813c
Merge branch 'master' into chore/storybook-event-pivot-tables
janhenrikoverland Aug 1, 2025
edb5a4f
chore: add data and tests for multiple option sets with shared codes
janhenrikoverland Aug 4, 2025
c6706c1
chore: naming
janhenrikoverland Aug 4, 2025
509d993
Merge branch 'chore/storybook-event-pivot-tables' of github.com:dhis2…
janhenrikoverland Aug 4, 2025
1b4c67d
chore: clean up option set data
janhenrikoverland Aug 4, 2025
f0b9842
chore: support hide na data
janhenrikoverland Aug 5, 2025
ec1b2a8
chore: update response tests
janhenrikoverland Aug 5, 2025
1b57669
chore: add yes only test
janhenrikoverland Aug 5, 2025
5647eb5
chore: add tests for removeNaDimensionItems
janhenrikoverland Aug 7, 2025
36f8b18
chore: refactor hide na (WIP)
janhenrikoverland Aug 11, 2025
66ec9b6
chore: fix tests with na data
janhenrikoverland Aug 12, 2025
88ec543
chore: add more types (WIP)
janhenrikoverland Aug 13, 2025
98fb1ff
chore: date storybook
janhenrikoverland Aug 14, 2025
4bc958a
chore: fix response tests (wip)
janhenrikoverland Aug 14, 2025
04edc24
chore: easify transformResponse (wip)
janhenrikoverland Aug 14, 2025
3242d18
chore: fix sort fn
janhenrikoverland Aug 18, 2025
44ac78c
chore: fix default sort fn
janhenrikoverland Aug 18, 2025
34e874d
chore: fix tests
janhenrikoverland Aug 19, 2025
e5493bd
chore: add response for datetime
janhenrikoverland Aug 20, 2025
414d984
chore: change prefix separator
janhenrikoverland Aug 21, 2025
c879809
chore: datetime
janhenrikoverland Aug 21, 2025
2a1d354
chore: email example storybook
janhenrikoverland Aug 22, 2025
037f6b6
chore: implement 'no value' in the engine
janhenrikoverland Aug 29, 2025
9d8b963
chore: fix test files
janhenrikoverland Aug 29, 2025
c90f207
chore: storybook for no value
janhenrikoverland Aug 29, 2025
2be53ab
chore: update numeric example
janhenrikoverland Sep 2, 2025
62cbbc5
test: update option set and response tests
janhenrikoverland Sep 2, 2025
e35b2a1
chore: update storybook examples
janhenrikoverland Sep 2, 2025
3751661
chore: rename test files
janhenrikoverland Sep 2, 2025
4dd901f
Merge branch 'master' into chore/storybook-event-pivot-tables
janhenrikoverland Sep 2, 2025
b69fc5b
fix: skip unsupported value types
janhenrikoverland Sep 2, 2025
009512c
Merge branch 'chore/storybook-event-pivot-tables' of github.com:dhis2…
janhenrikoverland Sep 2, 2025
46eefd9
Merge branch 'master' into chore/storybook-event-pivot-tables
janhenrikoverland Sep 2, 2025
fcb6592
fix: no value names defined by input
janhenrikoverland Sep 3, 2025
f064099
Merge branch 'chore/storybook-event-pivot-tables' of github.com:dhis2…
janhenrikoverland Sep 3, 2025
347b905
chore: rename to legendset
janhenrikoverland Sep 3, 2025
92f0c1b
chore: add time + update storybook display name
janhenrikoverland Sep 3, 2025
3c59c4f
chore: make sonarqube happy
janhenrikoverland Sep 3, 2025
229ad13
fix: apply 'no value' correctly to col headers
janhenrikoverland Sep 3, 2025
5a1a2f8
fix: support flexible style for dimension items (DHIS2-19818) (#1790)
janhenrikoverland Sep 4, 2025
1f22d70
fix: use default handler and item formatter for booleans
janhenrikoverland Sep 4, 2025
9fc73d3
chore: restructure and export
janhenrikoverland Sep 4, 2025
a3a1f47
chore: update paths
janhenrikoverland Sep 4, 2025
7bcf3b0
test: update tests
janhenrikoverland Sep 4, 2025
ed2e50c
chore: remove unused imports
janhenrikoverland Sep 4, 2025
31dda11
chore: remove unused vars
janhenrikoverland Sep 4, 2025
10dd134
test: use consts
janhenrikoverland Sep 5, 2025
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
2 changes: 1 addition & 1 deletion .storybook/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ const makeBabelConfig = require('@dhis2/cli-app-scripts/config/makeBabelConfig.j

module.exports = {
addons: ['@storybook/preset-create-react-app'],
stories: ['../src/**/*.stories.@(js)'],
stories: ['../src/__demo__/**/*.stories.@(js)'],

babel: async (config) => {
// currently styled-jsx is configured the same way for prod and
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,43 +7,43 @@ import {
NUMBER_TYPE_COLUMN_PERCENTAGE,
NUMBER_TYPE_ROW_PERCENTAGE,
} from '../modules/pivotTable/pivotTableConstants.js'
import avgDataResponse from './data/avgTotalAggregationType.data.json'
import avgMetadataResponse from './data/avgTotalAggregationType.metadata.json'
import avgVisualization from './data/avgTotalAggregationType.visualization.json'
import deepData from './data/deep.data.json'
import deepVisualization from './data/deep.visualization.json'
import deepWithFiltersData from './data/deepWithFilters.data.json'
import deepWithFiltersVisualization from './data/deepWithFilters.visualization.json'
import degsDataResponse from './data/degs.data.json'
import degsMetadataResponse from './data/degs.metadata.json'
import degsVisualization from './data/degs.visualization.json'
import diseaseWeeksDataResponse from './data/diseaseWeeks.data.json'
import diseaseWeeksMetadataResponse from './data/diseaseWeeks.metadata.json'
import diseaseWeeksVisualization from './data/diseaseWeeks.visualization.json'
import emptyColumnsDataResponse from './data/emptyColumns.data.json'
import emptyColumnsMetadataResponse from './data/emptyColumns.metadata.json'
import emptyColumnsVisualization from './data/emptyColumns.visualization.json'
import emptyRowsData from './data/emptyRows.data.json'
import emptyRowsVisualization from './data/emptyRows.visualization.json'
import hierarchyDataResponse from './data/hierarchy.data.json'
import hierarchyMetadataResponse from './data/hierarchy.metadata.json'
import hierarchyVisualization from './data/hierarchy.visualization.json'
import lastFiveYearsDataResponse from './data/lastFiveYears.data.json'
import lastFiveYearsMetadataResponse from './data/lastFiveYears.metadata.json'
import lastFiveYearsVisualization from './data/lastFiveYears.visualization.json'
import narrativeDataResponse from './data/narrative.data.json'
import narrativeMetadataResponse from './data/narrative.metadata.json'
import narrativeVisualization from './data/narrative.visualization.json'
import simpleDataResponse from './data/simple.data.json'
import simpleMetadataResponse from './data/simple.metadata.json'
import simpleVisualization from './data/simple.visualization.json'
import targetDataResponse from './data/target-with-legend.data.json'
import targetMetadataResponse from './data/target-with-legend.metadata.json'
import targetVisualization from './data/target-with-legend.visualization.json'
import underAbove100LegendSet from './data/under-above-100.legendSet.json'
import weeklyColumnsDataResponse from './data/weeklyColumns.data.json'
import weeklyColumnsMetadataResponse from './data/weeklyColumns.metadata.json'
import weeklyColumnsVisualization from './data/weeklyColumns.visualization.json'
import avgDataResponse from './data/aggregate/avgTotalAggregationType.data.json'
import avgMetadataResponse from './data/aggregate/avgTotalAggregationType.metadata.json'
import avgVisualization from './data/aggregate/avgTotalAggregationType.visualization.json'
import deepData from './data/aggregate/deep.data.json'
import deepVisualization from './data/aggregate/deep.visualization.json'
import deepWithFiltersData from './data/aggregate/deepWithFilters.data.json'
import deepWithFiltersVisualization from './data/aggregate/deepWithFilters.visualization.json'
import degsDataResponse from './data/aggregate/degs.data.json'
import degsMetadataResponse from './data/aggregate/degs.metadata.json'
import degsVisualization from './data/aggregate/degs.visualization.json'
import diseaseWeeksDataResponse from './data/aggregate/diseaseWeeks.data.json'
import diseaseWeeksMetadataResponse from './data/aggregate/diseaseWeeks.metadata.json'
import diseaseWeeksVisualization from './data/aggregate/diseaseWeeks.visualization.json'
import emptyColumnsDataResponse from './data/aggregate/emptyColumns.data.json'
import emptyColumnsMetadataResponse from './data/aggregate/emptyColumns.metadata.json'
import emptyColumnsVisualization from './data/aggregate/emptyColumns.visualization.json'
import emptyRowsData from './data/aggregate/emptyRows.data.json'
import emptyRowsVisualization from './data/aggregate/emptyRows.visualization.json'
import hierarchyDataResponse from './data/aggregate/hierarchy.data.json'
import hierarchyMetadataResponse from './data/aggregate/hierarchy.metadata.json'
import hierarchyVisualization from './data/aggregate/hierarchy.visualization.json'
import lastFiveYearsDataResponse from './data/aggregate/lastFiveYears.data.json'
import lastFiveYearsMetadataResponse from './data/aggregate/lastFiveYears.metadata.json'
import lastFiveYearsVisualization from './data/aggregate/lastFiveYears.visualization.json'
import narrativeDataResponse from './data/aggregate/narrative.data.json'
import narrativeMetadataResponse from './data/aggregate/narrative.metadata.json'
import narrativeVisualization from './data/aggregate/narrative.visualization.json'
import simpleDataResponse from './data/aggregate/simple.data.json'
import simpleMetadataResponse from './data/aggregate/simple.metadata.json'
import simpleVisualization from './data/aggregate/simple.visualization.json'
import targetDataResponse from './data/aggregate/target-with-legend.data.json'
import targetMetadataResponse from './data/aggregate/target-with-legend.metadata.json'
import targetVisualization from './data/aggregate/target-with-legend.visualization.json'
import underAbove100LegendSet from './data/aggregate/under-above-100.legendSet.json'
import weeklyColumnsDataResponse from './data/aggregate/weeklyColumns.data.json'
import weeklyColumnsMetadataResponse from './data/aggregate/weeklyColumns.metadata.json'
import weeklyColumnsVisualization from './data/aggregate/weeklyColumns.visualization.json'

const visualizationReset = {
colTotals: false,
Expand Down Expand Up @@ -135,7 +135,7 @@ const PivotTableOptionsWrapper = (story) => {
}

export default {
title: 'PivotTable',
title: 'PivotTable (aggregate)',
decorators: [PivotTableOptionsWrapper],
}

Expand Down
Loading
Loading