midgard/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

Add error if hideInAnswer:true and addExtraTags are used in the same mapping, fix #906

Browse source
This commit is contained in:
Pieter Vander Vennet 2022-06-28 01:38:57 +02:00
parent b9be22a932
commit e67c3ffa52
3 changed files with 7 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Models/ThemeConfig/TagRenderingConfig.ts
View file

@ -206,6 +206,11 @@ export default class TagRenderingConfig {
} else if (mapping.hideInAnswer !== undefined) {
hideInAnswer = TagUtils.Tag(mapping.hideInAnswer, `${context}.mapping[${i}].hideInAnswer`);
}
const addExtraTags = (mapping.addExtraTags ?? []).map((str, j) => TagUtils.SimpleTag(str, `${ctx}.addExtraTags[${j}]`));
if(hideInAnswer === true && addExtraTags.length > 0){
throw `${ctx}: Invalid mapping: 'hideInAnswer' is set to 'true', but 'addExtraTags' is enabled as well. This means that extra tags will be applied if this mapping is chosen as answer, but it cannot be chosen as answer. This either indicates a thought error or obsolete code that must be removed.`
}
let icon = undefined;
let iconClass = "small"
if(mapping.icon !== undefined){
@ -223,7 +228,7 @@ export default class TagRenderingConfig {
hideInAnswer,
icon,
iconClass,
addExtraTags: (mapping.addExtraTags ?? []).map((str, j) => TagUtils.SimpleTag(str, `${ctx}.addExtraTags[${j}]`))
addExtraTags
};
if (this.question) {
if (hideInAnswer !== true && mp.if !== undefined && !mp.if.isUsableAsAnswer()) {