diff --git a/src/app/logging/logging.component.html b/src/app/logging/logging.component.html index 5efba20..c9b5fe8 100644 --- a/src/app/logging/logging.component.html +++ b/src/app/logging/logging.component.html @@ -36,6 +36,11 @@ /> +
+ {{ 'fieldRequired' | translate }} +
+
@@ -51,6 +56,16 @@ />
+
+ {{ 'fieldRequired' | translate }} +
+
+ {{ 'toDateInvalidError' | translate }} +
diff --git a/src/app/logging/logging.component.ts b/src/app/logging/logging.component.ts index 67e2948..69b9cf1 100644 --- a/src/app/logging/logging.component.ts +++ b/src/app/logging/logging.component.ts @@ -162,8 +162,22 @@ export class LoggingComponent implements OnInit { } exportDataInExcel(): void { + const sanitizedData = this.filteredItems.map(item => { + if (item.requestBody) { + try { + const body = JSON.parse(item.requestBody); + if (body.password) { + body.password = '******'; + } + return { ...item, requestBody: JSON.stringify(body) }; + } catch { + return item; + } + } + return item; + }); this.excelExportService.exportExcel( - this.filteredItems, + sanitizedData, LOGGING_DETAILS_FILE_NAME, ); } diff --git a/src/app/utils/app.constants.ts b/src/app/utils/app.constants.ts index b7bc250..3ed2633 100644 --- a/src/app/utils/app.constants.ts +++ b/src/app/utils/app.constants.ts @@ -30,7 +30,7 @@ export const toDateAfterFromDateValidator: ValidatorFn = ( today.setHours(0, 0, 0, 0); // Rule 1: fromDate must be < toDate - if (fromDate >= toDate) { + if (fromDate > toDate) { return { fromDateGreaterThanOrEqualToToDate: true }; }