Skip to content

Fixed Pattern Validation #301

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
Gunjan Datta (gudatta) merged 6 commits into from
Jul 22, 2026
Merged

Fixed Pattern Validation #301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8b7c19c
Add for debugging
gudatta Jul 21, 2026
0d61668
Fixed recursive error.
gudatta Jul 22, 2026
35b0725
Updated control to be a note field.
gudatta Jul 22, 2026
e80e7f7
Fixed pattern validation.
gudatta Jul 22, 2026
9c4c71b
Updated the error message.
gudatta Jul 22, 2026
82c589c
Added a safety.
gudatta Jul 22, 2026
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 spfx/config/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"externals": {
"main-lib": {
"globalName": "main-lib",
"path": "../dist/site-admin.min.js"
"path": "../dist/site-admin.js"
}
},
"localizedResources": {
Expand Down
51 changes: 34 additions & 17 deletions src/reports/searchDocs.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,9 +136,14 @@ export class SearchDocs {
}).catch(reject);
break;
default:
// Convert the buffer to a string
let decoder = new TextDecoder("utf-8");
resolve(decoder.decode(buffer));
try {
// Convert the buffer to a string
let decoder = new TextDecoder("utf-8");
resolve(decoder.decode(buffer));
} catch {
// Reject the request
reject("Unable to decode the file content.");
}
break;
}
});
Expand Down Expand Up @@ -505,20 +510,21 @@ export class SearchDocs {
// See if an item was selected
if (item?.data) {
// Set the patterns
ctrlRegex.setValue((item.data as IRegexPattern).patterns.join(" "));
}
ctrlRegex.setValue((item.data as IRegexPattern).patterns.join("\r\n"));

// Clear the selection
ctrlRegexPatterns.dropdown.setValue(null);
// Clear the selection
ctrlRegexPatterns.dropdown.setValue(null);
}
}
} as Components.IFormControlPropsDropdown,
{
label: "Regex Patterns",
name: "RegexPatterns",
className: "mb-3",
description: "Enter the regular expression pattern to search for.",
type: Components.FormControlTypes.TextField,
description: "Enter the regular expression pattern on each line.",
type: Components.FormControlTypes.TextArea,
required: true,
rows: 10,
errorMessage: "You must enter at least 1 search term.",
onControlRendered: ctrl => { ctrlRegex = ctrl; },
onValidate: (ctrl, results) => {
Expand All @@ -528,21 +534,32 @@ export class SearchDocs {
results.isValid = false;
results.invalidMessage = "A regex pattern is required.";
} else {
// Validate the regex pattern
try {
// Create a new regex
new RegExp(results.value);
} catch (ex) {
let errors = [];

// Parse the patterns
results.value.split(/\r?\n/).forEach(pattern => {
// Validate the regex pattern
try {
// Create a new regex
new RegExp(pattern);
} catch (ex) {
// Add the error
errors.push(pattern);
}
});

// See if errors exist
if (errors.length > 0) {
// Invalidate the regex pattern
results.isValid = false;
results.invalidMessage = "The regex pattern is not valid.";
results.invalidMessage = "The regex pattern(s) were not valid:<br/>" + errors.join("<br/>");
}
}

// Return the results
return results;
}
},
} as Components.IFormControlPropsTextField,
{
label: "Load Permissions",
name: "LoadPermissions",
Expand Down Expand Up @@ -1029,7 +1046,7 @@ export class SearchDocs {

// Set the regex patterns
let regexPatterns = [];
(values["RegexPatterns"]?.split(' ') || []).forEach(pattern => {
(values["RegexPatterns"]?.split(/\r?\n/) || []).forEach(pattern => {
regexPatterns.push(new RegExp(pattern));
});

Expand Down
Loading