@fluid-topics/ft-search-context 2.0.30 → 2.0.32

package/build/store/FtAnalyticsSearchEventManager.d.ts

@@ -1,7 +1,7 @@
 import { FtSearchPageState } from "./model";
 import { FtReduxStore, ReduxWatcher } from "@fluid-topics/ft-wc-utils";
 import { FtSearchPageStateReducers } from "./redux";
-import { FtAnalyticsEventDocument, FtMap, FtSearchResultCluster, FtSearchResultClusterEntry } from "@fluid-topics/public-api";
+import { FtAnalyticsEventDocument, FtMap, FtSearchResultCluster, FtSearchResultClusterEntry, FtSearchResultsPageInfo } from "@fluid-topics/public-api";
 import { FtAnalyticsEventsService } from "@fluid-topics/ft-app-context";
 export declare class FtAnalyticsSearchEventManager {
     readonly store: FtReduxStore<FtSearchPageState, FtSearchPageStateReducers>;
@@ -13,7 +13,7 @@ export declare class FtAnalyticsSearchEventManager {
     appName: string | undefined;
     appVersion: string | undefined;
     document: FtAnalyticsEventDocument | undefined;
-    protected readonly resultsWatcher: ReduxWatcher<FtSearchPageState, FtSearchResultCluster[] | undefined>;
+    protected readonly resultsWatcher: ReduxWatcher<FtSearchPageState, [FtSearchResultCluster[] | undefined, FtSearchResultsPageInfo | undefined]>;
     constructor(store: FtReduxStore<FtSearchPageState, FtSearchPageStateReducers>, eventService?: FtAnalyticsEventsService);
     setEnableAnalyticsEvents(enableAnalyticsEvents: boolean): void;
     setAppName(appName: string): void;

package/build/store/FtAnalyticsSearchEventManager.js

@@ -11,20 +11,20 @@ export class FtAnalyticsSearchEventManager {
         this.appName = undefined;
         this.appVersion = undefined;
         this.document = undefined;
-        this.sendEvent = (results) => {
+        this.sendEvent = ([results, paging]) => {
             if (!this.canSendEvent() || !results) {
                 return;
             }
             const request = this.store.getState().request;
             if (this.document == undefined) {
-                this.sendKhubSearchEvent(request, results);
+                this.sendKhubSearchEvent(request, results, paging);
             }
             else {
-                this.sendDocumentSearchEvent(request, results);
+                this.sendDocumentSearchEvent(request, results, paging);
             }
         };
         this.eventsService = eventService !== null && eventService !== void 0 ? eventService : new FtAnalyticsEventsService();
-        this.resultsWatcher = watch(store, (s) => s.results, this.sendEvent);
+        this.resultsWatcher = watch(store, (s) => [s.results, s.paging], this.sendEvent);
     }
     setEnableAnalyticsEvents(enableAnalyticsEvents) {
         this.enableAnalyticsEvents = enableAnalyticsEvents;
@@ -54,7 +54,7 @@ export class FtAnalyticsSearchEventManager {
         const { editorMode } = ftAppInfoStore.getState();
         return this.enableAnalyticsEvents && !editorMode;
     }
-    sendKhubSearchEvent(request, results) {
+    sendKhubSearchEvent(request, results, paging) {
         const event = {
             offline: false,
             appVersion: this.appVersion,
@@ -62,7 +62,7 @@ export class FtAnalyticsSearchEventManager {
             name: FtAnalyticsEventName.KHUB__SEARCH,
             searchResponse: {
                 autocorrect: this.store.getState().spellcheck != undefined,
-                nbResults: results.length,
+                nbResults: paging ? paging.totalClustersCount : results.length,
             },
             searchQuery: {
                 terms: request.query,
@@ -73,7 +73,7 @@ export class FtAnalyticsSearchEventManager {
         };
         this.eventsService.sendKhubSearchEvent(event);
     }
-    sendDocumentSearchEvent(request, results) {
+    sendDocumentSearchEvent(request, results, paging) {
         const isRequestForThisDocument = request.metadataFilters.find((f) => {
             var _a;
             return f.key === "ft:publicationId" && ((_a = f.valueFilter) === null || _a === void 0 ? void 0 : _a.values[0]) === this.document.id;
@@ -86,7 +86,7 @@ export class FtAnalyticsSearchEventManager {
                 name: FtAnalyticsEventName.DOCUMENT__SEARCH,
                 searchResponse: {
                     autocorrect: this.store.getState().spellcheck != undefined,
-                    nbResults: results.length,
+                    nbResults: paging ? paging.totalClustersCount : results.length,
                 },
                 searchQuery: {
                     terms: request.query,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@fluid-topics/ft-search-context",
-    "version": "2.0.30",
+    "version": "2.0.32",
     "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.0.30",
-        "@fluid-topics/ft-wc-utils": "2.0.30",
+        "@fluid-topics/ft-app-context": "2.0.32",
+        "@fluid-topics/ft-wc-utils": "2.0.32",
         "lit": "3.1.0"
     },
     "devDependencies": {
         "@fluid-topics/public-api": "1.0.123"
     },
-    "gitHead": "842c87986021522cf8ebea6bf0880ea1a298b20e"
+    "gitHead": "7b9fd05cccbb50a04b9639b26e2d958ca494c83e"
 }