Skip to content

task/FOUR-25270-fix: Fixing mustache syntax variables in values with spaces #1834

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
nolanpro merged 2 commits into from
Jul 21, 2025
Merged

task/FOUR-25270-fix: Fixing mustache syntax variables in values with spaces #1834

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2868604
Fixing mustache syntax variables with values with spaces
CarliPinell Jul 15, 2025
047e66e
Solving issues with special characters
CarliPinell Jul 17, 2025
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
22 changes: 12 additions & 10 deletions src/components/renderer/form-record-list.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -469,16 +469,17 @@ export default {
this.currentPage = this.currentPage == 0 ? 1 : this.currentPage;
}
},
// Watch for changes in the option input field
"validationData.option": {
handler(newValue) {
// Watch for changes in validationData to handle any Mustache variable changes
validationData: {
handler(newValue, oldValue) {
if (this.source?.sourceOptions === "Collection" && this.source?.collectionFields?.pmql) {
this.onCollectionChange(
this.source?.collectionFields?.collectionId,
this.source?.collectionFields?.pmql
);
}
},
deep: true,
immediate: false
}
},
Expand Down Expand Up @@ -614,20 +615,21 @@ export default {
// Get data from validationData
const data = this.validationData || {};

// Clean up the PMQL by removing unnecessary quotes around Mustache variables
let processedPmql = pmql.replace(/"{{([^}]+)}}"/g, "{{$1}}");

// Process Mustache variables
processedPmql = Mustache.render(processedPmql, data);

// First, process all Mustache variables (both quoted and unquoted)
let processedPmql = Mustache.render(pmql, data);

// Check if the processed PMQL has empty values
if (this.hasEmptyValues(processedPmql)) {
this.collectionData = [];
return null;
}

// Add quotes around string values in PMQL if they don't have them
processedPmql = processedPmql.replace(/= ([^"'\s]+)/g, '= "$1"');
// This regex now properly handles values with spaces by looking for the end of the comparison
processedPmql = processedPmql.replace(
/= ([^"'\s][^"']*[^"'\s]|[^"'\s]+)(?=\s|$)/g,
'= "$1"'
);

return processedPmql;
} catch (error) {
Expand Down
Loading