Skip to content

[Backport 2025.02.xx] fix utils/generateTemplateString() in case of props is null or undefined #11809

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

Open
github-actions wants to merge 1 commit into
base: 2025.02.xx
Choose a base branch
from
Open

[Backport 2025.02.xx] fix utils/generateTemplateString() in case of props is null or undefined #11809

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion web/client/utils/TemplateUtils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ export const generateTemplateString = (function() {
.replace(/\$\{([\s]*[^;\s\{]+[\s]*)\}/g, (_, match) => {
const escapeFunction = escapeFn || (a => a);
return escapeFunction(match.trim().split(".").reduce((a, b) => {
return a && a[b];
return a && a[b] || '';
}, map));
});

Expand Down
6 changes: 6 additions & 0 deletions web/client/utils/__tests__/TemplateUtils-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,12 @@ describe('TemplateUtils', () => {
let templateResult = templateFunction({test: "TEST"});
expect(templateResult).toBe("this is a TEST2");
});
it('generateTemplateString with some null or undefined attributes', () => {
let templateFunction = generateTemplateString("#${desc}, ${desc1}, ${desc2}#");
expect(templateFunction).toExist();
let templateResult = templateFunction({desc: "desc value", desc1: null, desc2: undefined});
expect(templateResult).toEqual("#desc value, , #");
});

it('validateStringAttribute', () => {
const testObj = {
Expand Down