DigitaleBibliothek / Frontend / f16dcc79427

Commits

Giuseppe Digilio authored f16dcc79427 03 Oct 2022

[CST-6876] Refactoring in order to remove nested subscriptions

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

Modified

-113
+  ngOnInit(): void {
-114
+    this.currentUrl = this.router.url;
-115
+    this.filterValues$ = new BehaviorSubject(createPendingRemoteDataObject());
-116
+    this.currentPage = this.getCurrentPage().pipe(distinctUntilChanged());
-117
-118
+    this.searchOptions$ = this.searchConfigService.searchOptions;
-119
+    this.subs.push(
-120
+      this.searchOptions$.subscribe(() => this.updateFilterValueList()),
-121
+      this.refreshFilters.asObservable().pipe(
-122
+        filter((toRefresh: boolean) => toRefresh),
--
+      ).subscribe(() => {
--
+        this.retrieveFilterValues(false);
--
+      })
-+
+        mergeMap(() => this.retrieveFilterValues(false))
-+
+      ).subscribe()
-125
+    );
--
+    this.retrieveFilterValues();
-+
+    this.retrieveFilterValues().subscribe();
-127
+  }
-128
-129
+  /**
-130
+   * Prepare for refreshing the values of this filter
-131
+   */
-132
+  updateFilterValueList() {
-133
+    this.animationState = 'loading';
-134
+    this.collapseNextUpdate = true;
-135
+    this.filter = '';
-136
+  }
-271
+    }
-272
+  }
-273
-274
+  /**
-275
+   * Retrieve facet value
-276
+   */
-277
+  protected getFacetValue(facet: FacetValue): string {
-278
+    return getFacetValueForType(facet, this.filterConfig);
-279
+  }
-280
--
+  protected retrieveFilterValues(useCachedVersionIfAvailable = true) {
-+
+  protected retrieveFilterValues(useCachedVersionIfAvailable = true): Observable<RemoteData<PaginatedList<FacetValue>[]>> {
-282
+    const facetValues$ = observableCombineLatest([this.searchOptions$, this.currentPage]).pipe(
-283
+      map(([options, page]) => {
-284
+        return { options, page };
-285
+      }),
-286
+      switchMap(({ options, page }) => {
-287
+        return this.searchService.getFacetValuesFor(this.filterConfig, page, options, null, useCachedVersionIfAvailable)
-288
+          .pipe(
-289
+            getFirstSucceededRemoteData(),
-290
+            tap((rd: RemoteData<FacetValues>) => {
-291
+              this.isLastPage$.next(hasNoValue(rd?.payload?.next));
-292
+            }),
-293
+            map((rd: RemoteData<FacetValues>) => ({
-294
+                values: observableOf(rd),
-295
+                page: page
-296
+              })
-297
+            )
-298
+          );
-299
+      })
-300
+    );
-301
-302
+    let filterValues = [];
--
+    this.subs.push(
--
+      facetValues$.pipe(
--
+        mergeMap((facetOutcome) => {
--
+          const newValues$ = facetOutcome.values;
--
--
+          if (this.collapseNextUpdate) {
--
+            this.showFirstPageOnly();
--
+            facetOutcome.page = 1;
--
+            this.collapseNextUpdate = false;
--
+          }
--
+          if (facetOutcome.page === 1) {
--
+            filterValues = [];
--
+          }
--
--
+          filterValues = [...filterValues, newValues$];
--
--
+          return this.rdbs.aggregate(filterValues);
--
+        }),
--
+        tap((rd: RemoteData<PaginatedList<FacetValue>[]>) => {
--
+          this.selectedValues$ = this.filterService.getSelectedValuesForFilter(this.filterConfig).pipe(
--
+            map((selectedValues) => {
--
+              return selectedValues.map((value: string) => {
--
+                const fValue = [].concat(...rd.payload.map((page) => page.page))
--
+                                 .find((facetValue: FacetValue) => this.getFacetValue(facetValue) === value);
--
+                if (hasValue(fValue)) {
--
+                  return fValue;
--
+                }
--
+                const filterValue = stripOperatorFromFilterValue(value);
--
+                return Object.assign(new FacetValue(), { label: filterValue, value: filterValue });
--
+              });
--
+            })
--
+          );
--
+        })
--
+      ).subscribe((rd: RemoteData<PaginatedList<FacetValue>[]>) => {
-+
+    return facetValues$.pipe(
-+
+      mergeMap((facetOutcome) => {
-+
+        const newValues$ = facetOutcome.values;
-+
-+
+        if (this.collapseNextUpdate) {
-+
+          this.showFirstPageOnly();
-+
+          facetOutcome.page = 1;
-+
+          this.collapseNextUpdate = false;
-+
+        }
-+
+        if (facetOutcome.page === 1) {
-+
+          filterValues = [];
-+
+        }
-+
-+
+        filterValues = [...filterValues, newValues$];
-+
-+
+        return this.rdbs.aggregate(filterValues);
-+
+      }),
-+
+      tap((rd: RemoteData<PaginatedList<FacetValue>[]>) => {
-+
+        this.selectedValues$ = this.filterService.getSelectedValuesForFilter(this.filterConfig).pipe(
-+
+          map((selectedValues) => {
-+
+            return selectedValues.map((value: string) => {
-+
+              const fValue = [].concat(...rd.payload.map((page) => page.page))
-+
+                               .find((facetValue: FacetValue) => this.getFacetValue(facetValue) === value);
-+
+              if (hasValue(fValue)) {
-+
+                return fValue;
-+
+              }
-+
+              const filterValue = stripOperatorFromFilterValue(value);
-+
+              return Object.assign(new FacetValue(), { label: filterValue, value: filterValue });
-+
+            });
-+
+          })
-+
+        );
-+
+      }),
-+
+      tap((rd: RemoteData<PaginatedList<FacetValue>[]>) => {
-336
+        this.animationState = 'ready';
-337
+        this.filterValues$.next(rd);
-338
+      })
-339
+    );
-340
+  }
-341
-342
+  /**
-343
+   * Transforms the facet value string, so if the query matches part of the value, it's emphasized in the value
-344
+   * @param {FacetValue} facet The value of the facet as returned by the server
-345
+   * @param {string} query The query that was used to search facet values

Frontend

Commits

Jira Issues

Add shortcut