@fluid-topics/ft-search-context 1.2.2 → 1.2.4

package/build/store/FtSearchStateManager.d.ts

@@ -19,6 +19,7 @@ export declare class FtSearchStateManager {
     initService(): Promise<boolean>;
     setQuery(query: string): void;
     setContentLocale(contentLocale?: string): string | undefined;
+    forceContentLocale(contentLocale?: string): void;
     setPageSize(pageSize: number): void;
     setPageNumber(pageNumber: number): void;
     setSort(sort: FtSearchSortCriterion[]): void;

package/build/store/FtSearchStateManager.js

@@ -23,6 +23,11 @@ export class FtSearchStateManager {
         this.searchDebouncer = new Debouncer(100);
         this.suggestDebouncer = new Debouncer(300);
         this.service = service !== null && service !== void 0 ? service : new FtSearchService();
+        this.service.cache.addEventListener("clear-cache", (e) => {
+            if (e.detail.clearedKeys.includes("available-locales")) {
+                this.updateLocales();
+            }
+        });
     }
     async initService() {
         this.updateLocales();
@@ -30,15 +35,16 @@ export class FtSearchStateManager {
     }
     setQuery(query) {
         this.store.actions.setRequestQuery(query);
-        this.store.actions.setLiveQuery(query);
+        this.store.actions.liveQuery(query);
         this.store.actions.setPageNumber(1);
         this.launchSearch();
     }
     setContentLocale(contentLocale) {
-        let locales = this.store.getState().locales;
+        var _a;
+        let locales = (_a = this.store.getState().locales) !== null && _a !== void 0 ? _a : [];
         let previousContentLocale = this.store.getState().request.contentLocale;
         if (contentLocale != previousContentLocale) {
-            if (locales) {
+            if (locales.length > 0) {
                 const isKnown = (locale) => locales.some(l => l.lang == locale);
                 if (!isKnown(contentLocale)) {
                     contentLocale = isKnown(previousContentLocale) ? previousContentLocale : locales[0].lang;
@@ -51,6 +57,10 @@ export class FtSearchStateManager {
         }
         return contentLocale;
     }
+    forceContentLocale(contentLocale) {
+        this.store.actions.setRequestContentLocale(contentLocale);
+        this.launchSearch();
+    }
     setPageSize(pageSize) {
         this.store.actions.setPageSize(pageSize);
         this.launchSearch();
@@ -68,11 +78,6 @@ export class FtSearchStateManager {
         const cleanFilters = filters.filter(f => !f.valueFilter || f.valueFilter.values.length > 0);
         this.store.actions.setRequestFilters(cleanFilters);
         this.store.actions.setPageNumber(1);
-        cleanFilters.forEach(f => {
-            if (!this.facetIds.includes(f.key)) {
-                this.facetIds = [...this.facetIds, f.key];
-            }
-        });
         this.launchSearch();
     }
     setClusterSortCriterion(criterions) {
@@ -100,7 +105,7 @@ export class FtSearchStateManager {
     // Used in GWT
     clearAllFilters() {
         this.setFilters([]);
-        this.store.eventBus.dispatchEvent(new ClearAllFiltersEvent());
+        this.store.dispatchEvent(new ClearAllFiltersEvent());
     }
     addFacet(id) {
         this.facetIds = [...this.facetIds, id];
@@ -115,7 +120,14 @@ export class FtSearchStateManager {
         this.launchSearch();
     }
     get facetIds() {
-        return this.store.getState().request.facets.map(f => f.id);
+        var _a;
+        const request = this.store.getState().request;
+        return [
+            ...new Set([
+                ...request.facets.map(f => f.id),
+                ...((_a = request.metadataFilters) !== null && _a !== void 0 ? _a : []).map(f => f.key),
+            ])
+        ];
     }
     set facetIds(ids) {
         let uniqIds = [...new Set(ids)];
@@ -190,7 +202,7 @@ export class FtSearchStateManager {
         this.setFilters(filters);
     }
     setLiveQuery(query) {
-        this.store.actions.setLiveQuery(query);
+        this.store.actions.liveQuery(query);
         this.launchSuggest();
     }
     setRequest(request) {
@@ -198,7 +210,7 @@ export class FtSearchStateManager {
             ...request,
             facets: this.store.getState().request.facets
         });
-        this.store.actions.setLiveQuery(request.query);
+        this.store.actions.liveQuery(request.query);
         this.store.actions.setPageNumber(1);
         this.launchSearch();
     }
@@ -217,7 +229,7 @@ export class FtSearchStateManager {
         this.openExternalDocumentInNewTab = openExternalDocumentInNewTab;
     }
     updateLocales() {
-        return this.localesDebouncer.run(async () => this.store.actions.setLocales((await this.service.getAvailableSearchLocales()).contentLocales));
+        return this.localesDebouncer.run(async () => this.store.actions.locales((await this.service.getAvailableSearchLocales()).contentLocales));
     }
     launchSearch() {
         return this.searchDebouncer.run(() => this.fetchSearchData());
@@ -229,26 +241,29 @@ export class FtSearchStateManager {
         var _a, _b;
         try {
             (_a = this.cancelableSearch) === null || _a === void 0 ? void 0 : _a.cancel();
-            let request = this.store.getState().request;
-            this.store.actions.setPaging(undefined);
+            let request = {
+                ...this.store.getState().request,
+                facets: this.facetIds.map(id => ({ id })),
+            };
+            this.store.actions.paging(undefined);
             if (this.ignoreEmptyQuery && request.query.length == 0) {
-                this.store.actions.setResults(undefined);
-                this.store.actions.setFacets(undefined);
-                this.store.actions.setSpellcheck(undefined);
+                this.store.actions.results(undefined);
+                this.store.actions.facets(undefined);
+                this.store.actions.spellcheck(undefined);
             }
             else {
                 this.cancelableSearch = cancelable(this.service.launchSearch(request));
                 const results = await this.cancelableSearch;
                 if (results.paging.currentPage <= 1) {
-                    this.store.actions.setResults(results.results);
-                    this.store.actions.setFacets(results.facets);
-                    this.store.actions.setSpellcheck(results.spellcheck);
+                    this.store.actions.results(results.results);
+                    this.store.actions.facets(results.facets);
+                    this.store.actions.spellcheck(results.spellcheck);
                 }
                 else {
                     let newResults = ((_b = this.store.getState().results) !== null && _b !== void 0 ? _b : []).concat(results.results);
-                    this.store.actions.setResults(newResults);
+                    this.store.actions.results(newResults);
                 }
-                this.store.actions.setPaging(results.paging);
+                this.store.actions.paging(results.paging);
             }
         }
         catch (e) {
@@ -272,7 +287,7 @@ export class FtSearchStateManager {
             (_a = this.cancelableSuggest) === null || _a === void 0 ? void 0 : _a.cancel();
             this.cancelableSuggest = cancelable(this.service.launchSuggest(request));
             let results = await this.cancelableSuggest;
-            this.store.actions.setSuggestResults(results.suggestions);
+            this.store.actions.suggestResults(results.suggestions);
         }
         catch (e) {
             if (!(e instanceof CanceledPromiseError) && this.errorHandler) {

package/build/store/model.d.ts

@@ -1,14 +1,14 @@
 import { FtSearchFacet, FtSearchLocale, FtSearchResultCluster, FtSearchResultsPageInfo, FtSpellcheck, FtSuggestResult } from "@fluid-topics/public-api";
 import { EnrichedFtSearchRequest } from "@fluid-topics/ft-wc-utils";
 export interface FtSearchPageState {
-    locales?: Array<FtSearchLocale>;
+    locales: Array<FtSearchLocale> | undefined;
     request: EnrichedFtSearchRequest;
-    results?: Array<FtSearchResultCluster>;
-    facets?: Array<FtSearchFacet>;
-    paging?: FtSearchResultsPageInfo;
-    spellcheck?: FtSpellcheck;
+    results: Array<FtSearchResultCluster> | undefined;
+    facets: Array<FtSearchFacet> | undefined;
+    paging: FtSearchResultsPageInfo | undefined;
+    spellcheck: FtSpellcheck | undefined;
     liveQuery: string;
-    suggestResults?: Array<FtSuggestResult>;
+    suggestResults: Array<FtSuggestResult> | undefined;
 }
 export interface FtSearchResultsChangeEventDetail {
     request: EnrichedFtSearchRequest;

package/build/store/redux.d.ts

@@ -14,13 +14,6 @@ declare const searchPageStateReducers: {
     setRequestScope: (state: FtSearchPageState, action: PayloadAction<FtSearchPageState["request"]["scope"]>) => void;
     setOtherQueryParams: (state: FtSearchPageState, action: PayloadAction<FtSearchPageState["request"]["otherQueryParams"]>) => void;
     setRequestClusterSortCriterion: (state: FtSearchPageState, action: PayloadAction<FtSearchPageState["request"]["clusterSortCriterions"]>) => void;
-    setResults: (state: FtSearchPageState, action: PayloadAction<FtSearchPageState["results"]>) => void;
-    setFacets: (state: FtSearchPageState, action: PayloadAction<FtSearchPageState["facets"]>) => void;
-    setSpellcheck: (state: FtSearchPageState, action: PayloadAction<FtSearchPageState["spellcheck"]>) => void;
-    setLocales: (state: FtSearchPageState, action: PayloadAction<FtSearchPageState["locales"]>) => void;
-    setPaging: (state: FtSearchPageState, action: PayloadAction<FtSearchPageState["paging"]>) => void;
-    setLiveQuery: (state: FtSearchPageState, action: PayloadAction<FtSearchPageState["liveQuery"]>) => void;
-    setSuggestResults: (state: FtSearchPageState, action: PayloadAction<FtSearchPageState["suggestResults"]>) => void;
 };
 export type FtSearchPageStateReducers = typeof searchPageStateReducers;
 export declare const createSearchPageStore: (id: string) => FtReduxStore<FtSearchPageState, {
@@ -36,12 +29,5 @@ export declare const createSearchPageStore: (id: string) => FtReduxStore<FtSearc
     setRequestScope: (state: FtSearchPageState, action: PayloadAction<FtSearchPageState["request"]["scope"]>) => void;
     setOtherQueryParams: (state: FtSearchPageState, action: PayloadAction<FtSearchPageState["request"]["otherQueryParams"]>) => void;
     setRequestClusterSortCriterion: (state: FtSearchPageState, action: PayloadAction<FtSearchPageState["request"]["clusterSortCriterions"]>) => void;
-    setResults: (state: FtSearchPageState, action: PayloadAction<FtSearchPageState["results"]>) => void;
-    setFacets: (state: FtSearchPageState, action: PayloadAction<FtSearchPageState["facets"]>) => void;
-    setSpellcheck: (state: FtSearchPageState, action: PayloadAction<FtSearchPageState["spellcheck"]>) => void;
-    setLocales: (state: FtSearchPageState, action: PayloadAction<FtSearchPageState["locales"]>) => void;
-    setPaging: (state: FtSearchPageState, action: PayloadAction<FtSearchPageState["paging"]>) => void;
-    setLiveQuery: (state: FtSearchPageState, action: PayloadAction<FtSearchPageState["liveQuery"]>) => void;
-    setSuggestResults: (state: FtSearchPageState, action: PayloadAction<FtSearchPageState["suggestResults"]>) => void;
 }, import("redux").AnyAction>;
 export {};

package/build/store/redux.js

@@ -1,4 +1,4 @@
-import { FtReduxStore } from "@fluid-topics/ft-wc-utils";
+import { FtReduxStore, minmax } from "@fluid-topics/ft-wc-utils";
 const searchPageStateReducers = {
     setRequest: (state, action) => {
         state.request = action.payload;
@@ -10,10 +10,12 @@ const searchPageStateReducers = {
         state.request.contentLocale = action.payload;
     },
     setPageSize: (state, action) => {
-        state.request.paging.perPage = action.payload;
+        var _a;
+        const perPage = +((_a = action.payload) !== null && _a !== void 0 ? _a : 20);
+        state.request.paging.perPage = isNaN(perPage) ? 20 : minmax(1, perPage, 40);
     },
     setPageNumber: (state, action) => {
-        state.request.paging.page = action.payload;
+        state.request.paging.page = isNaN(action.payload) ? 1 : Math.max(1, action.payload);
     },
     setRequestSort: (state, action) => {
         state.request.sort = action.payload;
@@ -37,27 +39,6 @@ const searchPageStateReducers = {
         var _a;
         state.request.clusterSortCriterions = (_a = action.payload) !== null && _a !== void 0 ? _a : [];
     },
-    setResults: (state, action) => {
-        state.results = action.payload;
-    },
-    setFacets: (state, action) => {
-        state.facets = action.payload;
-    },
-    setSpellcheck: (state, action) => {
-        state.spellcheck = action.payload;
-    },
-    setLocales: (state, action) => {
-        state.locales = action.payload;
-    },
-    setPaging: (state, action) => {
-        state.paging = action.payload;
-    },
-    setLiveQuery: (state, action) => {
-        state.liveQuery = action.payload;
-    },
-    setSuggestResults: (state, action) => {
-        state.suggestResults = action.payload;
-    },
 };
 export const createSearchPageStore = (id) => FtReduxStore.get({
     name: "ft-search-" + id,
@@ -74,6 +55,12 @@ export const createSearchPageStore = (id) => FtReduxStore.get({
             },
         },
         liveQuery: "",
+        paging: undefined,
+        facets: undefined,
+        spellcheck: undefined,
+        locales: [],
+        results: undefined,
+        suggestResults: undefined
     },
     reducers: searchPageStateReducers
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluid-topics/ft-search-context",
-  "version": "1.2.2",
+  "version": "1.2.4",
   "description": "Context block for integrated search components",
   "keywords": [
     "Lit"
@@ -19,12 +19,12 @@
     "url": "ssh://git@scm.mrs.antidot.net:2222/fluidtopics/ft-web-components.git"
   },
   "dependencies": {
-    "@fluid-topics/ft-app-context": "1.2.2",
-    "@fluid-topics/ft-wc-utils": "1.2.2",
+    "@fluid-topics/ft-app-context": "1.2.4",
+    "@fluid-topics/ft-wc-utils": "1.2.4",
     "lit": "3.1.0"
   },
   "devDependencies": {
-    "@fluid-topics/public-api": "1.0.77"
+    "@fluid-topics/public-api": "1.0.78"
   },
-  "gitHead": "b12fa278dd5bc8a5b9d027ed52dae60b4c821ec4"
+  "gitHead": "c5822c07ea0e1ee8ed9b54f8d66ded338594a42f"
 }