Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2025-12-20 17:30:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

CustomFieldStringTemplate regular expressions now on minicard too

Browse source
This commit is contained in:
Martin Filser 2022-04-23 19:46:56 +02:00
parent d7f451a7d9
commit 53bfa967c6
3 changed files with 47 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

31
client/components/cards/cardCustomFields.js
View file

@ -2,6 +2,7 @@ import moment from 'moment/min/moment-with-locales';
import { TAPi18n } from '/imports/i18n';
import { DatePicker } from '/client/lib/datepicker';
import Cards from '/models/cards';
import { CustomFieldStringTemplate } from '/client/lib/customFields'
Template.cardCustomFieldsPopup.helpers({
hasCustomField() {
@ -245,38 +246,17 @@ CardCustomField.register('cardCustomField');
}.register('cardCustomField-dropdown'));
// cardCustomField-stringtemplate
(class extends CardCustomField {
class CardCustomFieldStringTemplate extends CardCustomField {
onCreated() {
super.onCreated();
this.stringtemplateFormat = this.data().definition.settings.stringtemplateFormat;
this.stringtemplateSeparator = this.data().definition.settings.stringtemplateSeparator;
this.customField = new CustomFieldStringTemplate(this.data().definition);
this.stringtemplateItems = new ReactiveVar(this.data().value ?? []);
}
formattedValue() {
const ret = (this.data().value ?? [])
.filter(value => !!value.trim())
.map(value => {
let _ret = this.stringtemplateFormat.replace(/[%$]\{.+?\}/g, function(_match) {
let __ret;
if (_match.match(/%\{value\}/i)) {
__ret = value;
} else {
_match = _match.replace(/^\$/, "");
try {
const _json = JSON.parse(_match);
__ret = value.replace(new RegExp(_json.regex, _json.flags), _json.replace);
} catch (err) {
console.error(err);
}
}
return __ret;
});
return _ret;
})
.join(this.stringtemplateSeparator ?? '');
const ret = this.customField.getFormattedValue(this.data().value);
return ret;
}
@ -348,4 +328,5 @@ CardCustomField.register('cardCustomField');
},
];
}
}.register('cardCustomField-stringtemplate'));
}
CardCustomFieldStringTemplate.register('cardCustomField-stringtemplate');

9
client/components/cards/minicard.js
View file

@ -1,4 +1,5 @@
import { TAPi18n } from '/imports/i18n';
import { CustomFieldStringTemplate } from '/client/lib/customFields'
// Template.cards.events({
// 'click .member': Popup.open('cardMember')
@ -31,12 +32,8 @@ BlazeComponent.extendComponent({
const customFieldTrueValue =
customField && customField.trueValue ? customField.trueValue : [];
return customFieldTrueValue
.filter(value => !!value.trim())
.map(value =>
definition.settings.stringtemplateFormat.replace(/%\{value\}/gi, value),
)
.join(definition.settings.stringtemplateSeparator ?? '');
const ret = new CustomFieldStringTemplate(definition).getFormattedValue(customFieldTrueValue);
return ret;
},
showCreator() {

38
client/lib/customFields.js Normal file
View file

@ -0,0 +1,38 @@
class CustomField {
constructor(definition) {
this.definition = definition;
}
}
export class CustomFieldStringTemplate extends CustomField {
constructor(definition) {
super(definition);
this.format = definition.settings.stringtemplateFormat;
this.separator = definition.settings.stringtemplateSeparator;
}
getFormattedValue(rawValue) {
const ret = (rawValue ?? [])
.filter(value => !!value.trim())
.map(value => {
let _ret = this.format.replace(/[%$]\{.+?\}/g, function(_match) {
let __ret;
if (_match.match(/%\{value\}/i)) {
__ret = value;
} else {
_match = _match.replace(/^\$/, "");
try {
const _json = JSON.parse(_match);
__ret = value.replace(new RegExp(_json.regex, _json.flags), _json.replace);
} catch (err) {
console.error(err);
}
}
return __ret;
});
return _ret;
})
.join(this.separator ?? '');
return ret;
}
}