Skip to content

chore: enable multiple measures to be selected in a map #150

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

Merged
ralvarez-dg merged 4 commits into from
Sep 3, 2026
+27 −11
Merged

chore: enable multiple measures to be selected in a map #150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f742582
chore: enable multiple measures to be selected in a map
timothygachengo Sep 3, 2026
3275b59
chore: add toggle to toggle multiple measures
timothygachengo Sep 3, 2026
1c19d24
chore: check for potentially missing object keys before referencing them
timothygachengo Sep 3, 2026
f2980e8
chore: check for potentially missing object keys before referencing them
timothygachengo Sep 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
16 changes: 10 additions & 6 deletions plugins/wp-react-blocks-plugin/blocks/map/APIConfig.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,14 +136,18 @@ export class APIConfig extends Component {
const {attributes: {type: prevType, dimension2:prevDimension2}} = prevProps


const prevTypeObject = types.filter(t => t.value === prevType).length > 0 ? types.filter(t => t.value === prevType)[0] : null
const currentType = types.filter(t => t.value === type).length > 0 ? types.filter(t => t.value === type)[0] : null
const prevTypeObject = types && types.filter(t => t.value === prevType).length > 0 ? types.filter(t => t.value === prevType)[0] : null
const currentType = types && types.length > 0
? types.find(t => t.value === type)
: null

Comment thread
timothygachengo marked this conversation as resolved.
if (type != prevType && currentType) {
if (prevTypeObject.supports.singleMeasure != currentType.supports.singleMeasure || (currentType.supports.singleMeasure == false && dimension2 != "none")) {
setAttributes({measures: [], filters: []})
} else {
setAttributes({filters: []})
if (prevTypeObject && prevTypeObject.supports) {
if (prevTypeObject.supports.singleMeasure != currentType.supports.singleMeasure || (currentType.supports.singleMeasure == false && dimension2 != "none")) {
setAttributes({measures: [], filters: []})
} else {
setAttributes({filters: []})
}
}
}

Expand Down
22 changes: 17 additions & 5 deletions plugins/wp-react-blocks-plugin/blocks/map/Measures.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,19 @@ import {getTranslation} from '@devgateway/dvz-wp-commons';

const Measures = (props) => {
const {
currentType,
onMeasuresChange,
onSetSingleMeasure,
Comment thread
timothygachengo marked this conversation as resolved.
allMeasures,
setAttributes,
attributes: {
measures,
dimension2,
customMeasureLabels
customMeasureLabels,
hasMultipleMeasures
}
} = props

const supportsMultipleMeasures = hasMultipleMeasures


const MeasureToggle = ({measure}) => {
return (<ToggleControl
Expand Down Expand Up @@ -53,11 +54,22 @@ const Measures = (props) => {


return <><PanelBody initialOpen={false} title={__("Measures")}>
<PanelRow>
<ToggleControl
label={__('Allow Multiple Measures')}
checked={hasMultipleMeasures}
onChange={(value) => setAttributes({hasMultipleMeasures: value, measures: []})}
/>
</PanelRow>
{
[...new Set(allMeasures.map(p => getTranslation(p.group)))].map(g => {
return (<PanelBody title={g}>
{allMeasures.filter(f => getTranslation(f.group) === g).map(m => <PanelRow><MeasureCheckBox
measure={m}></MeasureCheckBox></PanelRow>)}
{allMeasures.filter(f => getTranslation(f.group) === g).map(m => <PanelRow key={m.value}>
{supportsMultipleMeasures ?
<MeasureToggle measure={m}/> :
<MeasureCheckBox measure={m}/>
}
</PanelRow>)}
</PanelBody>
)
}
Expand Down
Loading