restructure facet handling

52North · Jan 31, 2025 · 86deb34 · 86deb34
1 parent 1bf9189
commit 86deb34
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/src/apps/empty/services/search-service.ts b/src/apps/empty/services/search-service.ts
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 import { Reactive, reactive } from "@conterra/reactivity-core";
 import { DeclaredService, ServiceOptions } from "@open-pioneer/runtime";
-import { CatalogService, Facet, OrderOption, SearchFilter, SearchResultEntry } from "catalog";
+import { CatalogService, OrderOption, SearchFilter, SearchResultEntry } from "catalog";
 import { NotificationService } from "@open-pioneer/notifier";
 import { API_URL, URL_PARAM_SEARCH_TERM } from "../constants";
 
@@ -16,7 +16,6 @@ export interface SearchService extends DeclaredService<"SearchService"> {
     results: SearchResultEntry[] | undefined;
     resultCount: number;
     currentFilter: SearchFilter;
-    facets: Facet[];
     hasActiveFilter: boolean;
     set pageSize(pageSize: number);
     set searchTerm(searchTerm: string | undefined);
@@ -38,8 +37,6 @@ export class SearchServiceImpl implements SearchService {
 
     #resultCount: Reactive<number> = reactive(0);
 
-    #facets: Reactive<Facet[]> = reactive([]);
-
     #currentFilter: SearchFilter = {
         pageSize: 5,
         page: 1,
@@ -67,10 +64,6 @@ export class SearchServiceImpl implements SearchService {
         return this.#currentFilter;
     }
 
-    get facets(): Facet[] {
-        return this.#facets.value;
-    }
-
     set searchTerm(term: string | undefined) {
         this.#currentFilter.searchTerm = term;
         this.triggerSearch();
@@ -152,7 +145,6 @@ export class SearchServiceImpl implements SearchService {
         }
         this.catalogSrvc.getFacets(API_URL).then((facets) => {
             this.#currentFilter.facets = facets;
-            this.#facets.value = facets;
             facets.forEach((facet) => facet.applyOfSearchParams(url.searchParams));
             this.triggerSearch();
         });

diff --git a/src/apps/empty/views/SearchView.tsx b/src/apps/empty/views/SearchView.tsx
@@ -25,8 +25,13 @@ import { useOnMountUnsafe } from "../components/helper";
 
 export function SearchView() {
     const searchSrvc = useService<SearchService>("SearchService");
-    const [results, loading, resultCount, facets] = useReactiveSnapshot(
-        () => [searchSrvc.results, searchSrvc.searching, searchSrvc.resultCount, searchSrvc.facets],
+    const [results, loading, resultCount, currentFilter] = useReactiveSnapshot(
+        () => [
+            searchSrvc.results,
+            searchSrvc.searching,
+            searchSrvc.resultCount,
+            searchSrvc.currentFilter
+        ],
         [searchSrvc]
     );
 
@@ -46,7 +51,9 @@ export function SearchView() {
                 </Center>
                 <Grid templateColumns="400px 1fr" gap={2}>
                     <GridItem w="100%">
-                        {facets?.map((f) => <FacetComp key={f.key} facet={f}></FacetComp>)}
+                        {currentFilter.facets.map((f) => (
+                            <FacetComp key={f.key} facet={f}></FacetComp>
+                        ))}
                     </GridItem>
                     <GridItem w="100%">
                         <VStack>