From 5574aef240dd924be35114e933b4551973ec9f31 Mon Sep 17 00:00:00 2001 From: "swapnil.verma" Date: Wed, 28 Jun 2023 12:03:05 +0530 Subject: [PATCH] [ACS-4985] Removed disableUpdateOnSubmit flag from search widgets --- .../search-check-list/search-check-list.component.ts | 9 ++------- .../search-date-range/search-date-range.component.ts | 9 ++------- .../search-datetime-range.component.ts | 9 ++------- .../search-number-range.component.ts | 11 +++-------- .../components/search-radio/search-radio.component.ts | 9 ++------- .../search-slider/search-slider.component.ts | 9 ++------- .../components/search-text/search-text.component.ts | 9 ++------- .../search-widget-container.component.ts | 3 --- .../src/lib/search/models/search-widget.interface.ts | 1 - 9 files changed, 15 insertions(+), 54 deletions(-) diff --git a/lib/content-services/src/lib/search/components/search-check-list/search-check-list.component.ts b/lib/content-services/src/lib/search/components/search-check-list/search-check-list.component.ts index 989e272b88..7a4516e520 100644 --- a/lib/content-services/src/lib/search/components/search-check-list/search-check-list.component.ts +++ b/lib/content-services/src/lib/search/components/search-check-list/search-check-list.component.ts @@ -48,7 +48,6 @@ export class SearchCheckListComponent implements SearchWidget, OnInit { pageSize = 5; isActive = false; enableChangeUpdate = true; - disableUpdateOnSubmit: boolean; displayValue$: Subject = new Subject(); constructor(private translationService: TranslationService) { @@ -95,9 +94,7 @@ export class SearchCheckListComponent implements SearchWidget, OnInit { this.clearOptions(); if (this.id && this.context) { this.updateDisplayValue(); - if (!this.disableUpdateOnSubmit) { - this.context.update(); - } + this.context.update(); } } @@ -145,9 +142,7 @@ export class SearchCheckListComponent implements SearchWidget, OnInit { if (this.id && this.context) { this.context.queryFragments[this.id] = query; this.updateDisplayValue(); - if(!this.disableUpdateOnSubmit) { - this.context.update(); - } + this.context.update(); } } } diff --git a/lib/content-services/src/lib/search/components/search-date-range/search-date-range.component.ts b/lib/content-services/src/lib/search/components/search-date-range/search-date-range.component.ts index be6e56008a..86ce7d7adb 100644 --- a/lib/content-services/src/lib/search/components/search-date-range/search-date-range.component.ts +++ b/lib/content-services/src/lib/search/components/search-date-range/search-date-range.component.ts @@ -70,7 +70,6 @@ export class SearchDateRangeComponent implements SearchWidget, OnInit, OnDestroy isActive = false; startValue: any; enableChangeUpdate: boolean; - disableUpdateOnSubmit: boolean; displayValue$: Subject = new Subject(); private onDestroy$ = new Subject(); @@ -152,9 +151,7 @@ export class SearchDateRangeComponent implements SearchWidget, OnInit, OnDestroy this.context.queryFragments[this.id] = `${this.settings.field}:['${start}' TO '${end}']`; this.updateDisplayValue(); - if(!this.disableUpdateOnSubmit) { - this.context.update(); - } + this.context.update(); } } @@ -217,9 +214,7 @@ export class SearchDateRangeComponent implements SearchWidget, OnInit, OnDestroy private updateQuery() { if (this.id && this.context) { this.updateDisplayValue(); - if (!this.disableUpdateOnSubmit) { - this.context.update(); - } + this.context.update(); } } diff --git a/lib/content-services/src/lib/search/components/search-datetime-range/search-datetime-range.component.ts b/lib/content-services/src/lib/search/components/search-datetime-range/search-datetime-range.component.ts index 1fd12ce231..11e32d6c36 100644 --- a/lib/content-services/src/lib/search/components/search-datetime-range/search-datetime-range.component.ts +++ b/lib/content-services/src/lib/search/components/search-datetime-range/search-datetime-range.component.ts @@ -65,7 +65,6 @@ export class SearchDatetimeRangeComponent implements SearchWidget, OnInit, OnDes isActive = false; startValue: any; enableChangeUpdate: boolean; - disableUpdateOnSubmit: boolean; displayValue$: Subject = new Subject(); private onDestroy$ = new Subject(); @@ -139,9 +138,7 @@ export class SearchDatetimeRangeComponent implements SearchWidget, OnInit, OnDes this.context.queryFragments[this.id] = `${this.settings.field}:['${start}' TO '${end}']`; this.updateDisplayValue(); - if(!this.disableUpdateOnSubmit) { - this.context.update(); - } + this.context.update(); } } @@ -205,9 +202,7 @@ export class SearchDatetimeRangeComponent implements SearchWidget, OnInit, OnDes private updateQuery() { if (this.id && this.context) { this.updateDisplayValue(); - if (!this.disableUpdateOnSubmit) { - this.context.update(); - } + this.context.update(); } } diff --git a/lib/content-services/src/lib/search/components/search-number-range/search-number-range.component.ts b/lib/content-services/src/lib/search/components/search-number-range/search-number-range.component.ts index c371d0531f..6a842b875b 100644 --- a/lib/content-services/src/lib/search/components/search-number-range/search-number-range.component.ts +++ b/lib/content-services/src/lib/search/components/search-number-range/search-number-range.component.ts @@ -41,7 +41,6 @@ export class SearchNumberRangeComponent implements SearchWidget, OnInit { id: string; settings?: SearchWidgetSettings; context?: SearchQueryBuilderService; - disableUpdateOnSubmit: boolean; field: string; format = '[{FROM} TO {TO}]'; @@ -99,9 +98,7 @@ export class SearchNumberRangeComponent implements SearchWidget, OnInit { const value = this.formatString(this.format, map); this.context.queryFragments[this.id] = `${this.field}:${value}`; - if (!this.disableUpdateOnSubmit) { - this.context.update(); - } + this.context.update(); } } @@ -161,10 +158,8 @@ export class SearchNumberRangeComponent implements SearchWidget, OnInit { reset() { this.clear(); - if (!this.disableUpdateOnSubmit) { - if (this.id && this.context) { - this.context.update(); - } + if (this.id && this.context) { + this.context.update(); } } } diff --git a/lib/content-services/src/lib/search/components/search-radio/search-radio.component.ts b/lib/content-services/src/lib/search/components/search-radio/search-radio.component.ts index ff8c10c184..2c33ce8580 100644 --- a/lib/content-services/src/lib/search/components/search-radio/search-radio.component.ts +++ b/lib/content-services/src/lib/search/components/search-radio/search-radio.component.ts @@ -50,7 +50,6 @@ export class SearchRadioComponent implements SearchWidget, OnInit { isActive = false; startValue: any; enableChangeUpdate: boolean; - disableUpdateOnSubmit: boolean; displayValue$: Subject = new Subject(); constructor() { @@ -98,9 +97,7 @@ export class SearchRadioComponent implements SearchWidget, OnInit { submitValues() { this.setValue(this.value); this.updateDisplayValue(); - if(!this.disableUpdateOnSubmit) { - this.context.update(); - } + this.context.update(); } hasValidValue() { @@ -147,9 +144,7 @@ export class SearchRadioComponent implements SearchWidget, OnInit { if (initialValue !== null) { this.setValue(initialValue); this.updateDisplayValue(); - if (!this.disableUpdateOnSubmit) { - this.context.update(); - } + this.context.update(); } } } diff --git a/lib/content-services/src/lib/search/components/search-slider/search-slider.component.ts b/lib/content-services/src/lib/search/components/search-slider/search-slider.component.ts index 756998a3c6..52c5c8121a 100644 --- a/lib/content-services/src/lib/search/components/search-slider/search-slider.component.ts +++ b/lib/content-services/src/lib/search/components/search-slider/search-slider.component.ts @@ -41,7 +41,6 @@ export class SearchSliderComponent implements SearchWidget, OnInit { max: number; thumbLabel = false; enableChangeUpdate: boolean; - disableUpdateOnSubmit: boolean; displayValue$: Subject = new Subject(); /** The numeric value represented by the slider. */ @@ -91,9 +90,7 @@ export class SearchSliderComponent implements SearchWidget, OnInit { } submitValues() { - if(!this.disableUpdateOnSubmit) { - this.updateQuery(this.value); - } + this.updateQuery(this.value); } hasValidValue() { @@ -117,9 +114,7 @@ export class SearchSliderComponent implements SearchWidget, OnInit { } else { this.context.queryFragments[this.id] = `${this.settings.field}:[0 TO ${value}]`; } - if (!this.disableUpdateOnSubmit) { - this.context.update(); - } + this.context.update(); } } diff --git a/lib/content-services/src/lib/search/components/search-text/search-text.component.ts b/lib/content-services/src/lib/search/components/search-text/search-text.component.ts index 1884359775..c257c26deb 100644 --- a/lib/content-services/src/lib/search/components/search-text/search-text.component.ts +++ b/lib/content-services/src/lib/search/components/search-text/search-text.component.ts @@ -40,7 +40,6 @@ export class SearchTextComponent implements SearchWidget, OnInit { startValue: string; isActive = false; enableChangeUpdate = true; - disableUpdateOnSubmit: boolean; displayValue$: Subject = new Subject(); ngOnInit() { @@ -87,16 +86,12 @@ export class SearchTextComponent implements SearchWidget, OnInit { this.displayValue$.next(value); if (this.context && this.settings && this.settings.field) { this.context.queryFragments[this.id] = value ? `${this.settings.field}:'${this.getSearchPrefix()}${value}${this.getSearchSuffix()}'` : ''; - if (!this.disableUpdateOnSubmit) { - this.context.update(); - } + this.context.update(); } } submitValues() { - if(!this.disableUpdateOnSubmit) { - this.updateQuery(this.value); - } + this.updateQuery(this.value); } hasValidValue() { diff --git a/lib/content-services/src/lib/search/components/search-widget-container/search-widget-container.component.ts b/lib/content-services/src/lib/search/components/search-widget-container/search-widget-container.component.ts index 1e08a9423a..a3bce95256 100644 --- a/lib/content-services/src/lib/search/components/search-widget-container/search-widget-container.component.ts +++ b/lib/content-services/src/lib/search/components/search-widget-container/search-widget-container.component.ts @@ -57,8 +57,6 @@ export class SearchWidgetContainerComponent implements OnInit, OnDestroy, OnChan @Input() value: any; - @Input() - disableUpdateOnSubmit = false; componentRef: ComponentRef; @@ -92,7 +90,6 @@ export class SearchWidgetContainerComponent implements OnInit, OnDestroy, OnChan ref.instance.id = this.id; ref.instance.settings = {...this.settings}; ref.instance.context = this.queryBuilder; - ref.instance.disableUpdateOnSubmit = this.disableUpdateOnSubmit; if (this.value) { ref.instance.isActive = true; ref.instance.startValue = this.value; diff --git a/lib/content-services/src/lib/search/models/search-widget.interface.ts b/lib/content-services/src/lib/search/models/search-widget.interface.ts index 233899de9d..b7dcbf58b0 100644 --- a/lib/content-services/src/lib/search/models/search-widget.interface.ts +++ b/lib/content-services/src/lib/search/models/search-widget.interface.ts @@ -25,7 +25,6 @@ export interface SearchWidget { settings?: SearchWidgetSettings; context?: SearchQueryBuilderService; isActive?: boolean; - disableUpdateOnSubmit?: boolean; startValue: any; /* stream emit value on changes */ displayValue$: Subject;