Skip to content

chore: refactor OrgUnitDialog to functional component [DHIS2-18209] #3586

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
BRaimbault wants to merge 5 commits into
base: master
Choose a base branch
from
Draft

chore: refactor OrgUnitDialog to functional component [DHIS2-18209] #3586

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9e819e9
chore: refactor OrgUnitDialog to functional component
BRaimbault Nov 20, 2025
eac84a9
chore: fix lint errors
BRaimbault Nov 20, 2025
118f3c7
fix: update OrgUnitDialog
BRaimbault Nov 20, 2025
f4452d5
Merge branch 'master' into chore/DHIS2-18209-OrgUnitDialog
BRaimbault Jan 21, 2026
616847f
Merge branch 'master' into chore/DHIS2-18209-OrgUnitDialog
BRaimbault Feb 3, 2026
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
206 changes: 97 additions & 109 deletions src/components/edit/orgUnit/OrgUnitDialog.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import i18n from '@dhis2/d2-i18n'
import PropTypes from 'prop-types'
import React, { Component } from 'react'
import { connect } from 'react-redux'
import React, { useEffect, useState, useCallback } from 'react'
import { useDispatch } from 'react-redux'
import {
setRadiusLow,
setOrganisationUnitColor,
Expand All @@ -20,122 +20,110 @@ import OrgUnitSelect from '../../orgunits/OrgUnitSelect.jsx'
import Labels from '../shared/Labels.jsx'
import styles from '../styles/LayerDialog.module.css'

class OrgUnitDialog extends Component {
static propTypes = {
setOrganisationUnitColor: PropTypes.func.isRequired,
setRadiusLow: PropTypes.func.isRequired,
validateLayer: PropTypes.bool.isRequired,
onLayerValidation: PropTypes.func.isRequired,
organisationUnitColor: PropTypes.string,
radiusLow: PropTypes.number,
rows: PropTypes.array,
}
const OrgUnitDialog = ({
validateLayer,
onLayerValidation,
organisationUnitColor,
radiusLow,
rows,
}) => {
const dispatch = useDispatch()

state = {
tab: 'orgunits',
}

componentDidUpdate(prev) {
const { validateLayer, onLayerValidation } = this.props

if (validateLayer && validateLayer !== prev.validateLayer) {
onLayerValidation(this.validate())
}
}

render() {
const {
radiusLow,
organisationUnitColor,
setOrganisationUnitColor,
setRadiusLow,
} = this.props

const { tab, orgUnitsError } = this.state

return (
<div className={styles.content} data-test="orgunitdialog">
<Tabs value={tab} onChange={(tab) => this.setState({ tab })}>
<Tab value="orgunits">{i18n.t('Organisation Units')}</Tab>
<Tab value="style">{i18n.t('Style')}</Tab>
</Tabs>
<div className={styles.tabContent}>
{tab === 'orgunits' && (
<OrgUnitSelect warning={orgUnitsError} />
)}
{tab === 'style' && (
<div
className={styles.flexColumnFlow}
data-test="orgunitdialog-styletab"
>
<div className={styles.flexColumn}>
<Labels />
<ColorPicker
label={i18n.t('Boundary color')}
color={
organisationUnitColor || ORG_UNIT_COLOR
}
onChange={setOrganisationUnitColor}
className={styles.narrowField}
/>
<NumberField
label={i18n.t('Point radius')}
min={MIN_RADIUS}
max={MAX_RADIUS}
value={
radiusLow !== undefined
? radiusLow
: ORG_UNIT_RADIUS
}
onChange={setRadiusLow}
className={styles.narrowFieldIcon}
/>
</div>
<div className={styles.flexColumn}>
<StyleByGroupSet
defaultStyleType={STYLE_TYPE_COLOR}
/>
</div>
</div>
)}
</div>
</div>
)
}

// TODO: Add to parent class?
setErrorState(key, message, tab) {
this.setState({
[key]: message,
tab,
})
const [tab, setTab] = useState('orgunits')
const [orgUnitsError, setOrgUnitsError] = useState(null)

// --------------------------
// Validation handler
// --------------------------
const setErrorState = useCallback((message, tabName) => {
setOrgUnitsError(message)
setTab(tabName)
return false
}

validate() {
const { rows } = this.props
}, [])

const validate = useCallback(() => {
if (!getOrgUnitsFromRows(rows).length) {
return this.setErrorState(
'orgUnitsError',
return setErrorState(
i18n.t('No organisation units are selected'),
'orgunits'
)
}

return true
}
}, [rows, setErrorState])

// --------------------------
// Validation (was componentDidUpdate)
// --------------------------
useEffect(() => {
if (validateLayer) {
onLayerValidation(validate())
}
}, [validateLayer, validate, onLayerValidation])

// --------------------------
// Render
// --------------------------
return (
<div className={styles.content} data-test="orgunitdialog">
<Tabs value={tab} onChange={setTab}>
<Tab value="orgunits">{i18n.t('Organisation Units')}</Tab>
<Tab value="style">{i18n.t('Style')}</Tab>
</Tabs>

<div className={styles.tabContent}>
{tab === 'orgunits' && (
<OrgUnitSelect warning={orgUnitsError} />
)}

{tab === 'style' && (
<div
className={styles.flexColumnFlow}
data-test="orgunitdialog-styletab"
>
<div className={styles.flexColumn}>
<Labels />
<ColorPicker
label={i18n.t('Boundary color')}
color={organisationUnitColor || ORG_UNIT_COLOR}
onChange={(color) =>
dispatch(setOrganisationUnitColor(color))
}
className={styles.narrowField}
/>
<NumberField
label={i18n.t('Point radius')}
min={MIN_RADIUS}
max={MAX_RADIUS}
value={
radiusLow !== undefined
? radiusLow
: ORG_UNIT_RADIUS
}
onChange={(value) =>
dispatch(setRadiusLow(value))
}
className={styles.narrowFieldIcon}
/>
</div>

<div className={styles.flexColumn}>
<StyleByGroupSet
defaultStyleType={STYLE_TYPE_COLOR}
/>
</div>
</div>
)}
</div>
</div>
)
}

OrgUnitDialog.propTypes = {
validateLayer: PropTypes.bool.isRequired,
onLayerValidation: PropTypes.func.isRequired,
organisationUnitColor: PropTypes.string,
radiusLow: PropTypes.number,
rows: PropTypes.array,
}

export default connect(
null,
{
setRadiusLow,
setOrganisationUnitColor,
},
null,
{
forwardRef: true,
}
)(OrgUnitDialog)
export default OrgUnitDialog
Loading