diff --git a/lib/content-services/src/lib/search/components/search-date-range-advanced-tabbed/search-date-range-advanced-tabbed.component.ts b/lib/content-services/src/lib/search/components/search-date-range-advanced-tabbed/search-date-range-advanced-tabbed.component.ts index f5123725bb..8d4ed06a5c 100644 --- a/lib/content-services/src/lib/search/components/search-date-range-advanced-tabbed/search-date-range-advanced-tabbed.component.ts +++ b/lib/content-services/src/lib/search/components/search-date-range-advanced-tabbed/search-date-range-advanced-tabbed.component.ts @@ -212,10 +212,10 @@ export class SearchDateRangeAdvancedTabbedComponent implements SearchWidget, OnI private updateDisplayValue(value: Partial, field: string) { this.combinedDisplayValue = ''; this.displayValueMapByField.set(field, this.generateDisplayValue(value)); - this.displayValueMapByField.forEach((displayValue: string, field: string) => { + this.displayValueMapByField.forEach((displayValue: string, fieldForDisplayLabel: string) => { if (displayValue) { - const displayLabelForField = `${this.translateService.instant(this.settings.displayedLabelsByField[field]).toUpperCase()}: ${displayValue}`; - this.combinedDisplayValue = this.combinedDisplayValue ? `${this.combinedDisplayValue} ${displayLabelForField}` : `${displayLabelForField}` + const displayLabelForField = `${this.translateService.instant(this.settings.displayedLabelsByField[fieldForDisplayLabel]).toUpperCase()}: ${displayValue}`; + this.combinedDisplayValue = this.combinedDisplayValue ? `${this.combinedDisplayValue} ${displayLabelForField}` : `${displayLabelForField}`; } }); } diff --git a/lib/content-services/src/lib/search/components/search-date-range-advanced-tabbed/search-date-range-advanced/search-date-range-advanced.component.scss b/lib/content-services/src/lib/search/components/search-date-range-advanced-tabbed/search-date-range-advanced/search-date-range-advanced.component.scss index c6956c7245..a24ad08732 100644 --- a/lib/content-services/src/lib/search/components/search-date-range-advanced-tabbed/search-date-range-advanced/search-date-range-advanced.component.scss +++ b/lib/content-services/src/lib/search/components/search-date-range-advanced-tabbed/search-date-range-advanced/search-date-range-advanced.component.scss @@ -40,7 +40,6 @@ margin-top: 2em; } } - } } } diff --git a/lib/content-services/src/lib/search/components/search-date-range-advanced-tabbed/search-date-range-advanced/search-date-range-advanced.component.ts b/lib/content-services/src/lib/search/components/search-date-range-advanced-tabbed/search-date-range-advanced/search-date-range-advanced.component.ts index f6c6c2ff12..f590acdc8c 100644 --- a/lib/content-services/src/lib/search/components/search-date-range-advanced-tabbed/search-date-range-advanced/search-date-range-advanced.component.ts +++ b/lib/content-services/src/lib/search/components/search-date-range-advanced-tabbed/search-date-range-advanced/search-date-range-advanced.component.ts @@ -124,6 +124,11 @@ export class SearchDateRangeAdvancedComponent implements OnInit, OnDestroy { this.betweenStartDateFormControl.clearValidators(); this.betweenEndDateFormControl.clearValidators(); break; + default: + this.form.controls.inLastValue.clearValidators(); + this.betweenStartDateFormControl.clearValidators(); + this.betweenEndDateFormControl.clearValidators(); + break; } this.betweenStartDateFormControl.updateValueAndValidity(); this.betweenEndDateFormControl.updateValueAndValidity(); @@ -197,7 +202,7 @@ export class SearchDateRangeAdvancedComponent implements OnInit, OnDestroy { // } onLastDateValueChanged(event: Event) { - let value: string = event.target['value']; + const value: string = event.target['value']; event.target['value'] = value.replace(/[-.]*0*([1-9]*\d*)/g, '$1'); } }