Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 14 additions & 2 deletions i18n/en.pot
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ msgstr ""
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
"POT-Creation-Date: 2026-03-23T09:34:56.311Z\n"
"PO-Revision-Date: 2026-03-23T09:34:56.312Z\n"
"POT-Creation-Date: 2026-05-19T13:29:09.839Z\n"
"PO-Revision-Date: 2026-05-19T13:29:09.839Z\n"

msgid "view only"
msgstr "view only"
Expand Down Expand Up @@ -1336,6 +1336,18 @@ msgstr "Assigned Categories"
msgid "No value"
msgstr "No value"

msgid "Active"
msgstr "Active"

msgid "Completed"
msgstr "Completed"

msgid "Scheduled"
msgstr "Scheduled"

msgid "Cancelled"
msgstr "Cancelled"

msgid "Text"
msgstr "Text"

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"@dhis2/cli-app-scripts": "^12.11.0",
"@dhis2/cli-style": "^10.7.9",
"@dhis2/d2-i18n": "^1.1.0",
"@dhis2/ui": "^10.12.7",
"@dhis2/ui": "^10.16.0",
"@storybook/preset-create-react-app": "^10.3.4",
"@storybook/react-webpack5": "^10.3.4",
"@testing-library/dom": "^10.4.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ exports[`DimensionItem matches the snapshot with recommended 1`] = `
</span>
<span
aria-describedby=""
class="jsx-237564060"
class="jsx-1705673118"
data-test="dhis2-uicore-tooltip-reference"
tabindex="0"
>
Expand Down
1 change: 1 addition & 0 deletions src/components/OrgUnitDimension/OrgUnitDimension.js
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,7 @@ const OrgUnitDimension = ({
)
.map((item) => item.path)}
onChange={onSelectItems}
displayProperty={displayNameProp}
dataTest={'org-unit-tree'}
/>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,13 @@ jest.mock('@dhis2-ui/organisation-unit-tree', () => {

return {
...lib,
OrganisationUnitTree: () => <div>Org unit tree component mock</div>,
// eslint-disable-next-line react/prop-types
OrganisationUnitTree: ({ displayProperty }) => (
<div>
<div>Org unit tree component mock</div>
<div data-test="display-property">{displayProperty}</div>
</div>
),
}
})

Expand Down Expand Up @@ -75,6 +81,19 @@ describe('OrgUnitDimension', () => {
).toBeInTheDocument()
})

test('OrgUnitDimension forwards displayNameProp to the org unit tree as displayProperty', async () => {
renderOrgUnitDimension({
...props,
displayNameProp: 'displayShortName',
})

await screen.findByText('Org unit tree component mock')

expect(screen.getByTestId('display-property')).toHaveTextContent(
'displayShortName'
)
})

test('OrgUnitDimension calls onSelect when an organisation unit is selected', async () => {
const user = userEvent.setup()

Expand Down
4 changes: 0 additions & 4 deletions src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -334,10 +334,6 @@ export { renderValue as formatValue } from './modules/renderValue.js'

export { transformResponse as transformEventAggregateResponse } from './modules/response/event/response.js'

// Modules: eventVisualization

export { transformEventVisualization } from './modules/eventVisualization/eventVisualization.js'

// Utils: colorSets
export {
COLOR_SET_DEFAULT,
Expand Down
74 changes: 0 additions & 74 deletions src/modules/dimensions.js

This file was deleted.

This file was deleted.

26 changes: 0 additions & 26 deletions src/modules/eventVisualization/eventVisualization.js

This file was deleted.

Loading
Loading