Skip to content

#697: Parse regexp before regex validation #884

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
hetunandu merged 4 commits into from
Oct 7, 2020
Merged

#697: Parse regexp before regex validation #884

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
de6f8fa
Parse regexp before validating user input
deepakchethan Oct 2, 2020
9dfbf8e
Bug fixes
deepakchethan Oct 6, 2020
56b0d1c
Revert some code
deepakchethan Oct 6, 2020
6deec78
test
deepakchethan Oct 6, 2020
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
23 changes: 19 additions & 4 deletions app/client/src/widgets/InputWidget.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,21 @@ class InputWidget extends BaseWidget<InputWidgetProps, WidgetState> {
return {
isValid: `{{
function(){
let parsedRegex = null;
if (this.regex) {
// break up the regexp pattern into 4 parts: given regex, regex prefix , regex pattern, regex flags
// Example /appsmith/i will be split into ["/appsmith/gi", "/", "appsmith", "gi"]
const regexParts = this.regex.match(/(\\/?)(.+)\\1([a-z]*)/i);
if (regexParts === null) {
parsedRegex = new RegExp(this.regex);
}
// if we don't have a regex flags (gmisuy), convert provided string into regexp directly
if (regexParts[3] && !/^(?!.*?(.).*?\\1)[gmisuy]+$/.test(regexParts[3])) {
parsedRegex = RegExp(this.regex);
}
// if we have a regex flags, use it to form regexp
parsedRegex = new RegExp(regexParts[2], regexParts[3]);
}
if (this.inputType === "EMAIL") {
const emailRegex = new RegExp(/^\\w+([\\.-]?\\w+)*@\\w+([\\.-]?\\w+)*(\\.\\w{2,3})+$/);
return emailRegex.test(this.text);
Expand All @@ -60,16 +75,16 @@ class InputWidget extends BaseWidget<InputWidgetProps, WidgetState> {
}
else if (this.isRequired) {
if(this.text && this.text.length) {
if(this.regex) {
return new RegExp(this.regex).test(this.text)
if (parsedRegex) {
return parsedRegex.test(this.text)
} else {
return true;
}
} else {
return false;
}
} if (this.regex) {
return new RegExp(this.regex).test(this.text)
} if (parsedRegex) {
return parsedRegex.test(this.text)
} else {
return true;
}
Expand Down