@fluid-topics/ft-search-context 2.1.18 → 2.1.20

package/build/store/FtAnalyticsSearchEventManager.js

@@ -1,7 +1,7 @@
-import { accessResult, watch } from "@fluid-topics/ft-wc-utils";
-import { FtAnalyticsEventName, FtAnalyticsPublicationType, FtSearchResultType } from "@fluid-topics/public-api";
-import { FtAnalyticsEventsService, ftAppInfoStore } from "@fluid-topics/ft-app-context";
-import { convertMetadataFilterToAnalyticsFacet, getAnalyticsLastUpdate } from "./utils/analytics-utils";
+import { accessResult, watch, } from "@fluid-topics/ft-wc-utils";
+import { FtAnalyticsEventName, FtAnalyticsPublicationType, FtSearchResultType, } from "@fluid-topics/public-api";
+import { FtAnalyticsEventsService, ftAppInfoStore, } from "@fluid-topics/ft-app-context";
+import { convertMetadataFilterToAnalyticsFacet, getAnalyticsLastUpdate, } from "./utils/analytics-utils";
 export class FtAnalyticsSearchEventManager {
     constructor(store, eventService) {
         this.store = store;

package/build/store/FtSearchStateManager.d.ts

@@ -18,8 +18,10 @@ export declare class FtSearchStateManager extends FtStateManager {
     constructor(store: FtReduxStore<FtSearchPageState, FtSearchPageStateReducers>, service?: FtSearchService);
     onNewNeededRequest: (neededRequest: string) => void;
     initService(): Promise<boolean>;
-    addWindowListeners(): void;
-    removeWindowListeners(): void;
+    addListeners(): void;
+    removeListeners(): void;
+    private get recentQueriesStorageKey();
+    private get taruqaConfigStorageKey();
     private onStorageEvent;
     private updateSearchRequest;
     setQuery(query: string): void;
@@ -56,6 +58,7 @@ export declare class FtSearchStateManager extends FtStateManager {
     setIgnoreEmptyQuery(ignoreEmptyQuery: boolean): void;
     setOpenExternalDocumentInNewTab(openExternalDocumentInNewTab: boolean): void;
     setCanUpdateUiLocale(canUpdateUiLocale: boolean): void;
+    private loadTaruqaTemplate;
     private loadRecentQueries;
     addRecentQuery(query: string): void;
     removeRecentQuery(query: string): void;

package/build/store/FtSearchStateManager.js

@@ -1,14 +1,13 @@
 import { FtSearchStateResourceRequest, } from "./model";
 import { cancelable, CanceledPromiseError, Debouncer, deepCopy, FtStateManager, minmax, watch, } from "@fluid-topics/ft-wc-utils";
 import { createSearchPageStore, } from "./redux";
-import { FtSearchKeywordMatch, FtSearchScope, FtVirtualField, } from "@fluid-topics/public-api";
+import { FtSearchKeywordMatch, FtSearchScope, FtUserRole, FtVirtualField, userHasRole, } from "@fluid-topics/public-api";
 import { FtSearchService } from "./utils/FtSearchService";
 import { ClearAllFiltersEvent } from "../utils";
-import { ftAppStateManager } from "@fluid-topics/ft-app-context";
+import { AuthenticationChangeEvent, ftAppInfoStore, ftAppStateManager, } from "@fluid-topics/ft-app-context";
 export const searchInDocumentTitlesOnlySelector = (s) => s.request.virtualField === FtVirtualField.TITLE_ONLY
     && s.request.scope === FtSearchScope.DOCUMENTS;
 export const keywordMatchSelector = (s) => s.request.keywordMatch == FtSearchKeywordMatch.MANDATORY;
-const recentQueriesStorageKey = "ft-recent-queries";
 const maxRecentQueries = 20;
 export class FtSearchStateManager extends FtStateManager {
     static build(id, service) {
@@ -27,9 +26,21 @@ export class FtSearchStateManager extends FtStateManager {
         };
         this.onStorageEvent = (e) => {
             // detect changes from any context
-            if (e.key === recentQueriesStorageKey) {
+            if (e.key === this.recentQueriesStorageKey) {
                 this.loadRecentQueries();
             }
+            else if (e.key === this.taruqaConfigStorageKey) {
+                this.loadTaruqaTemplate();
+            }
+        };
+        this.loadTaruqaTemplate = () => {
+            var _a;
+            let taruqaTemplateOverride;
+            if (userHasRole(ftAppInfoStore.getState().session, FtUserRole.DEBUG_USER)) {
+                const config = JSON.parse((_a = window.localStorage.getItem(this.taruqaConfigStorageKey)) !== null && _a !== void 0 ? _a : "{}");
+                taruqaTemplateOverride = config.overrideEnabled ? config.template : undefined;
+            }
+            this.updateSearchRequest({ taruqaTemplateOverride, changedByConfiguration: true });
         };
         this.localesDebouncer = new Debouncer(10);
         this.searchDebouncer = new Debouncer(100);
@@ -74,13 +85,22 @@ export class FtSearchStateManager extends FtStateManager {
             this.setSortId(this.store.getState().request.sortId);
         });
         this.loadRecentQueries();
+        this.loadTaruqaTemplate();
         return this.launchSearch();
     }
-    addWindowListeners() {
+    addListeners() {
         window.addEventListener("storage", this.onStorageEvent);
+        ftAppInfoStore.addEventListener(AuthenticationChangeEvent.eventName, this.loadTaruqaTemplate);
     }
-    removeWindowListeners() {
+    removeListeners() {
         window.removeEventListener("storage", this.onStorageEvent);
+        ftAppInfoStore.removeEventListener(AuthenticationChangeEvent.eventName, this.loadTaruqaTemplate);
+    }
+    get recentQueriesStorageKey() {
+        return ftAppInfoStore.getState().tenantId + "-ft-recent-queries";
+    }
+    get taruqaConfigStorageKey() {
+        return ftAppInfoStore.getState().tenantId + "-taruqa-experiment-conf";
     }
     updateSearchRequest(partialRequest, resetPaging = false) {
         const request = deepCopy(this.store.getState().request);
@@ -111,7 +131,7 @@ export class FtSearchStateManager extends FtStateManager {
             }
             this.updateSearchRequest({ contentLocale, metadataFilters: [] }, true);
             if (this.canUpdateUiLocale && ((_b = ftAppStateManager.store.getState().localesConfiguration) === null || _b === void 0 ? void 0 : _b.searchLanguageSetsUiLanguage) && contentLocale) {
-                ftAppStateManager.requestUiLocaleUpdate(contentLocale);
+                ftAppStateManager.requestUiLocaleUpdate(contentLocale, contentLocale);
             }
         }
         return contentLocale;
@@ -306,7 +326,7 @@ export class FtSearchStateManager extends FtStateManager {
     }
     loadRecentQueries() {
         var _a;
-        this.store.actions.recentQueries(JSON.parse((_a = window.localStorage.getItem(recentQueriesStorageKey)) !== null && _a !== void 0 ? _a : "[]"));
+        this.store.actions.recentQueries(JSON.parse((_a = window.localStorage.getItem(this.recentQueriesStorageKey)) !== null && _a !== void 0 ? _a : "[]"));
     }
     addRecentQuery(query) {
         query = query.trim();
@@ -328,10 +348,10 @@ export class FtSearchStateManager extends FtStateManager {
     }
     setRecentQueries(queries) {
         const newValue = JSON.stringify(queries);
-        window.localStorage.setItem(recentQueriesStorageKey, newValue);
+        window.localStorage.setItem(this.recentQueriesStorageKey, newValue);
         // notify all contexts
         window.dispatchEvent(new StorageEvent("storage", {
-            key: recentQueriesStorageKey,
+            key: this.recentQueriesStorageKey,
             newValue,
             storageArea: window.localStorage,
             url: window.location.href,

package/build/store/utils/analytics-utils.js

@@ -1,12 +1,12 @@
 export function getAnalyticsLastUpdate(facets) {
     return facets
-        .filter(f => f.key === 'ft:lastEdition')
-        .filter(f => !f.valueFilter)
-        .map(f => {
+        .filter((f) => f.key === "ft:lastEdition")
+        .filter((f) => !f.valueFilter)
+        .map((f) => {
         if (f.dateFilter) {
             return f.dateFilter.type;
         }
-        return 'CUSTOM';
+        return "CUSTOM";
     }).shift();
 }
 export function convertMetadataFilterToAnalyticsFacet(facet) {
@@ -15,7 +15,7 @@ export function convertMetadataFilterToAnalyticsFacet(facet) {
         return {
             key: facet.key,
             type: "DATE",
-            dateValue: facet.dateFilter.type
+            dateValue: facet.dateFilter.type,
         };
     }
     else if (facet.rangeFilter) {
@@ -23,14 +23,14 @@ export function convertMetadataFilterToAnalyticsFacet(facet) {
             key: facet.key,
             type: "RANGE",
             from: facet.rangeFilter.from,
-            to: facet.rangeFilter.to
+            to: facet.rangeFilter.to,
         };
     }
     else {
         return {
             key: facet.key,
             values: (_a = facet.valueFilter) === null || _a === void 0 ? void 0 : _a.values,
-            negative: (_b = facet.valueFilter) === null || _b === void 0 ? void 0 : _b.negative
+            negative: (_b = facet.valueFilter) === null || _b === void 0 ? void 0 : _b.negative,
         };
     }
 }

package/build/utils.js

@@ -10,17 +10,17 @@ export class SearchResultOpenContextMenuEvent extends CustomEvent {
 }
 export class LoadErrorEvent extends CustomEvent {
     constructor(e) {
-        super("ft-search-load-error", { detail: e });
+        super("ft-search-load-error", { detail: e, composed: true, bubbles: true });
     }
 }
 export class SearchRequestChangeEvent extends CustomEvent {
     constructor(request) {
-        super("ft-search-request-change", { detail: request });
+        super("ft-search-request-change", { detail: request, composed: true, bubbles: true });
     }
 }
 export class SearchResultsChangeEvent extends CustomEvent {
     constructor(request, paging, spellcheck) {
-        super("ft-search-results-change", { detail: { request, paging, spellcheck } });
+        super("ft-search-results-change", { detail: { request, paging, spellcheck }, composed: true, bubbles: true });
     }
 }
 export class ClearAllFiltersEvent extends Event {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@fluid-topics/ft-search-context",
-    "version": "2.1.18",
+    "version": "2.1.20",
     "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": "2.1.18",
-        "@fluid-topics/ft-wc-utils": "2.1.18",
+        "@fluid-topics/ft-app-context": "2.1.20",
+        "@fluid-topics/ft-wc-utils": "2.1.20",
         "lit": "3.1.0"
     },
     "devDependencies": {
-        "@fluid-topics/public-api": "1.0.132"
+        "@fluid-topics/public-api": "1.0.136"
     },
-    "gitHead": "2effe252f9ab22ede85f961b8464ec8aa4d27870"
+    "gitHead": "77e9f03085f977dde887e175b964bf66b862253f"
 }