111731: Also emit the AppliedFilter for date values

Author: alexandrevryghem

src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts

@@ -287,23 +287,28 @@ export class SearchFacetFilterComponent implements OnInit, OnDestroy {
         return filterValues;
       }),
       tap((allFacetValues: FacetValues[]) => {
-        const allAppliedFilters: AppliedFilter[] = [].concat(...allFacetValues.map((facetValues: FacetValues) => facetValues.appliedFilters))
-          .filter((appliedFilter: AppliedFilter) => hasValue(appliedFilter));
-        this.selectedAppliedFilters$ = this.filterService.getSelectedValuesForFilter(this.filterConfig).pipe(
-          map((selectedValues: string[]) => {
-            const appliedFilters: AppliedFilter[] = selectedValues.map((value: string) => {
-              return allAppliedFilters.find((appliedFilter: AppliedFilter) => appliedFilter.value === stripOperatorFromFilterValue(value));
-            }).filter((appliedFilter: AppliedFilter) => hasValue(appliedFilter));
-            this.changeAppliedFilters.emit(appliedFilters);
-            return appliedFilters;
-          }),
-        );
+        this.setAppliedFilter(allFacetValues);
         this.animationState = 'ready';
         this.facetValues$.next(allFacetValues);
       })
     );
   }
 
+  setAppliedFilter(allFacetValues: FacetValues[]): void {
+    const allAppliedFilters: AppliedFilter[] = [].concat(...allFacetValues.map((facetValues: FacetValues) => facetValues.appliedFilters))
+      .filter((appliedFilter: AppliedFilter) => hasValue(appliedFilter));
+
+    this.selectedAppliedFilters$ = this.filterService.getSelectedValuesForFilter(this.filterConfig).pipe(
+      map((selectedValues: string[]) => {
+        const appliedFilters: AppliedFilter[] = selectedValues.map((value: string) => {
+          return allAppliedFilters.find((appliedFilter: AppliedFilter) => appliedFilter.value === stripOperatorFromFilterValue(value));
+        }).filter((appliedFilter: AppliedFilter) => hasValue(appliedFilter));
+        this.changeAppliedFilters.emit(appliedFilters);
+        return appliedFilters;
+      }),
+    );
+  }
+
   /**
    * Transforms the facet value string, so if the query matches part of the value, it's emphasized in the value
    * @param {FacetValue} facet The value of the facet as returned by the server

src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.ts

@@ -1,4 +1,4 @@
-import { BehaviorSubject, combineLatest as observableCombineLatest, Subscription } from 'rxjs';
+import { BehaviorSubject, combineLatest as observableCombineLatest, of as observableOf , Subscription } from 'rxjs';
 import { map, startWith } from 'rxjs/operators';
 import { isPlatformBrowser } from '@angular/common';
 import { Component, Inject, OnDestroy, OnInit, PLATFORM_ID, EventEmitter } from '@angular/core';
@@ -22,6 +22,7 @@ import { SearchConfigurationService } from '../../../../../core/shared/search/se
 import { RouteService } from '../../../../../core/services/route.service';
 import { hasValue } from '../../../../empty.util';
 import { AppliedFilter } from '../../../models/applied-filter.model';
+import { FacetValues } from '../../../models/facet-values.model';
 
 /**
  * The suffix for a range filters' minimum in the frontend URL
@@ -115,6 +116,15 @@ export class SearchRangeFilterComponent extends SearchFacetFilterComponent imple
     ).subscribe((minmax) => this.range = minmax);
   }
 
+  setAppliedFilter(allFacetValues: FacetValues[]): void {
+    const appliedFilters: AppliedFilter[] = [].concat(...allFacetValues.map((facetValues: FacetValues) => facetValues.appliedFilters))
+      .filter((appliedFilter: AppliedFilter) => hasValue(appliedFilter))
+      .filter((appliedFilter: AppliedFilter) => appliedFilter.filter === this.filterConfig.name);
+
+    this.selectedAppliedFilters$ = observableOf(appliedFilters);
+    this.changeAppliedFilters.emit(appliedFilters);
+  }
+
   /**
    * Submits new custom range values to the range filter from the widget
    */