Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"dattatable": "^2.11.76",
"exceljs": "^4.4.0",
"fast-xml-parser": "^5.9.3",
"gd-sprest-bs": "^10.15.90",
"gd-sprest-bs": "^10.15.91",
"jszip": "^3.10.1",
"mammoth": "^1.12.0",
"moment": "^2.30.1",
Expand Down
20 changes: 17 additions & 3 deletions src/reports/searchDocs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -499,7 +499,16 @@ export class SearchDocs {
required: true,
value: keywords,
errorMessage: "You must enter at least 1 search term.",
onControlRendered: ctrl => { ctrlSearchTerms = ctrl; }
onControlRendered: ctrl => { ctrlSearchTerms = ctrl; },
onValidate: (ctrl, results) => {
// See if this control is hidden
if (!ctrlSearchTerms.isVisible) {
// Not requires
results.isValid = true;
}

return results;
}
},
{
label: "Regex Categories",
Expand Down Expand Up @@ -531,8 +540,13 @@ export class SearchDocs {
errorMessage: "You must enter at least 1 search term.",
onControlRendered: ctrl => { ctrlRegex = ctrl; },
onValidate: (ctrl, results) => {
// Ensure a pattern exists
if ((results.value || "").trim().length == 0) {
// See if this control is hidden
if (!ctrlSearchTerms.isVisible) {
// Not requires
results.isValid = true;
}
// Else, ensure a pattern exists
else if ((results.value || "").trim().length == 0) {
// Invalidate the extensions
results.isValid = false;
results.invalidMessage = "A regex pattern is required.";
Expand Down
Loading