diff --git a/package.json b/package.json index 0af7a12..4c32b5a 100644 --- a/package.json +++ b/package.json @@ -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", diff --git a/src/reports/searchDocs.ts b/src/reports/searchDocs.ts index 4242451..6f3705c 100644 --- a/src/reports/searchDocs.ts +++ b/src/reports/searchDocs.ts @@ -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", @@ -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.";