@sinequa/atomic-angular 1.19.1 → 1.19.3

package/fesm2022/sinequa-atomic-angular.mjs

@@ -7,7 +7,7 @@ import highlightWords from 'highlight-words';
 import { ActivatedRoute, Router, NavigationEnd, RouterLink, RouterLinkActive, RouterModule } from '@angular/router';
 import { withDevtools } from '@angular-architects/ngrx-toolkit';
 import { signalStore, signalStoreFeature, withState, withMethods, patchState, getState, withComputed } from '@ngrx/signals';
-import { EngineType, fetchApp, extraColumns, sysLang, fetchPrincipal, globalConfig, filter, getQueryParamsFromUrl, isRedirectPending, info, clearSessionTokens, login, error, setGlobalConfig, initializeAppConfig, notify, addConcepts, queryParamsFromUrl, patchUserSettings, deleteUserSettings, fetchUserSettings, warn, buildPathsAndLevels, escapeExpr, fetchQuery, flattenLegacyFilterValues, isAuthenticated, isExpired, debug, AuditEventType, fetchSuggest, isObject, Audit, getMetadata, bisect, isNotInputEvent, fetchSponsoredLinks, translateAggregationToDateOptions, aggItemRegex, parseValueAndOperatorFromItem, fetchSuggestField, fetchSimilarDocuments, logout, fetchChangePassword, fetchSendPasswordResetEmail, expiresSoon, suggestionsToTreeAggregationNodes, labels, fetchLabels, guid, getRelativeDate, createUserProfile, deleteUserProfileProperty, patchUserProfile, isJsonable, addAuditAdditionalInfo, getToken, setToken, createHeaders } from '@sinequa/atomic';
+import { EngineType, fetchApp, extraColumns, sysLang, fetchPrincipal, globalConfig, filter, getQueryParamsFromUrl, isRedirectPending, info, clearSessionTokens, login, error, setGlobalConfig, initializeAppConfig, notify, addConcepts, queryParamsFromUrl, patchUserSettings, deleteUserSettings, fetchUserSettings, warn, buildPathsAndLevels, escapeExpr, fetchQuery, flattenLegacyFilterValues, isAuthenticated, isExpired, debug, AuditEventType, fetchSuggest, Audit, isObject, getMetadata, bisect, isNotInputEvent, fetchSponsoredLinks, translateAggregationToDateOptions, aggItemRegex, parseValueAndOperatorFromItem, fetchSuggestField, fetchSimilarDocuments, logout, fetchChangePassword, fetchSendPasswordResetEmail, expiresSoon, suggestionsToTreeAggregationNodes, labels, fetchLabels, guid, getRelativeDate, createUserProfile, deleteUserProfileProperty, patchUserProfile, isJsonable, addAuditAdditionalInfo, getToken, setToken, createHeaders } from '@sinequa/atomic';
 import { takeUntilDestroyed, toObservable, toSignal } from '@angular/core/rxjs-interop';
 import { DatePipe, DATE_PIPE_DEFAULT_TIMEZONE, DATE_PIPE_DEFAULT_OPTIONS, Location, NgTemplateOutlet, NgStyle, NgClass, NgComponentOutlet } from '@angular/common';
 import { HttpClient, HttpParams, httpResource, HttpResponse, HttpContextToken, HttpHeaders } from '@angular/common/http';
@@ -4404,116 +4404,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.29", ngImpo
                 }]
         }] });
 
-class JsonMethodPluginService {
-    http = inject(HttpClient);
-    API_URL = `${globalConfig.backendUrl}/api/v1`;
-    /**
-     * Call a JsonMethod plugin using an HTTP POST
-     *
-     * @param method The name of the JsonMethod plugin
-     * @param query Parameters to pass to the plugin
-     * @param options HTTP options for the request
-     * @returns An observable of the plugin's return value
-     */
-    post(method, query, options) {
-        if (!isObject(query)) {
-            return throwError(() => ({ error: 'invalid query object' }));
-        }
-        return this.http.post(`${this.API_URL}/plugin/${method}`, query, options);
-    }
-    /**
-     * Call a JsonMethod plugin using an HTTP GET
-     *
-     * @param method The name of the JsonMethod plugin
-     * @param query Parameters to pass to the plugin
-     * @param options HTTP options for the request
-     * @returns An observable of the plugin's return value
-     */
-    get(method, query, options) {
-        return this.http.get(`${this.API_URL}/plugin/${method}`, {
-            params: query,
-            ...options
-        });
-    }
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.29", ngImport: i0, type: JsonMethodPluginService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
-    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.29", ngImport: i0, type: JsonMethodPluginService, providedIn: 'root' });
-}
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.29", ngImport: i0, type: JsonMethodPluginService, decorators: [{
-            type: Injectable,
-            args: [{
-                    providedIn: 'root'
-                }]
-        }] });
-
-/**
- * The route an audit event names: the path, without its leading slash, query string or fragment.
- * `/search?q=irsn#p2` and `/search` are the same route — arriving on one from the other is a new
- * query, not a navigation.
- */
-function routeNameOf(url) {
-    return url.slice(1).split(/[?#]/)[0];
-}
-class NavigationService {
-    router = inject(Router);
-    auditService = inject(AuditService);
-    // The route of the previous navigation, used only to dedupe audit route-change notifications in
-    // navigationEnd$ below. Kept separate from urlAfterNavigation so that getter stays correct
-    // regardless of whether anything subscribes to navigationEnd$.
-    //
-    // It used to hold the full url (`/search?q=irsn`) while the comparison was against the bare route
-    // name (`search`): the two could never be equal, so the dedupe never fired and every navigation
-    // was audited — including the query-param changes that make up most of a search session.
-    previousRouteName = null;
-    /**
-     * The URL of the current navigation, used to redirect the user after login.
-     *
-     * Sourced directly from `Router.url`, which Angular keeps up to date on every navigation with no
-     * subscription required — unlike a field updated as a side effect of `navigationEnd$` below,
-     * which only happens for whoever actually subscribes to it.
-     *
-     * The authentication screens are never returned: sending someone back to `/logout` after they
-     * signed in defeats the sign-in, and back to `/login` loops. The exclusion used to be a literal
-     * `!== "/login"`, which let through `/logout`, `/login?mode=changepassword` — same screen, one
-     * query param — and any application whose `loginPath` is not spelled `/login`.
-     */
-    get urlAfterNavigation() {
-        const url = this.router.url;
-        return isAuthRoute(url, globalConfig.loginPath) ? null : url;
-    }
-    /**
-     * Observable that emits events of type `NavigationEnd` from the Angular Router.
-     *
-     * This observable performs the following operations:
-     * - Maps all router events to `RouterEvent`.
-     * - Filters the events to only include instances of `NavigationEnd`.
-     * - Taps into the event stream to notify the audit service when the route itself changes — a new
-     *   query, a filter or another page of results stays on the same route and is not one.
-     * - Shares the replayed value with a buffer size of 1 to ensure subscribers receive the latest emitted value.
-     *
-     * @type Observable<RouterEvent>
-     */
-    navigationEnd$ = this.router.events.pipe(map(event => event), filter$1((event) => event instanceof NavigationEnd), tap(event => {
-        const routeName = routeNameOf(event.url);
-        // The empty name is the application root, which has never been audited.
-        if (routeName && routeName !== this.previousRouteName) {
-            this.auditService.notifyRouteChange(routeName);
-        }
-        // Every route is remembered, the authentication screens included. Skipping them would swallow
-        // the return: leaving `/search` for `/login` and coming back is two route changes, and the
-        // second one would compare against a `search` the user has meanwhile left. (The exclusion that
-        // used to sit here never ran — the dedupe above it could not fire.)
-        this.previousRouteName = routeName;
-    }), shareReplay(1));
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.29", ngImport: i0, type: NavigationService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
-    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.29", ngImport: i0, type: NavigationService, providedIn: "root" });
-}
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.29", ngImport: i0, type: NavigationService, decorators: [{
-            type: Injectable,
-            args: [{
-                    providedIn: "root"
-                }]
-        }] });
-
 // pre-configured highlights's colors
 const HIGHLIGHTS = new InjectionToken('highlights', {
     factory: () => [
@@ -4799,17 +4689,45 @@ class PreviewService {
      * @returns the html id
      */
     getEntityId(entity, value, index) {
-        if (!this.previewData)
-            return undefined;
-        // Combine filters for better performance.
-        // NB: positionInCategories[entity] is a zero-based index, so the first occurrence is 0.
-        // Use a presence check (not truthiness) to avoid dropping that first occurrence.
-        const entitySearched = this.previewData.highlightsPerLocation
-            .filter(item => item.positionInCategories[entity] !== undefined && item.values.some(v => v === value))
-            .map(e => ({ id: e.positionInCategories[entity] }));
-        const id = entitySearched[index]?.id;
-        return id;
+        return this.getEntityLocations(entity, value)[index];
     }
+    /**
+     * Get the ids of every occurrence of an entity value that is actually highlighted in the preview,
+     * ordered by position in the document.
+     *
+     * This is the source of truth for entity navigation: the `count` carried by the indexed record can be
+     * greater than the number of occurrences located in the converted document (ES-32245).
+     *
+     * @param entity the entity type (i.e. "geo")
+     * @param value the entity value (i.e. "AUSTRALIA")
+     * @returns the html ids (`positionInCategories[entity]`), empty when nothing is highlighted
+     */
+    getEntityLocations(entity, value) {
+        const data = this.previewData;
+        if (!data)
+            return [];
+        let perEntity = this.entityLocationsCache.get(data);
+        if (!perEntity) {
+            perEntity = new Map();
+            this.entityLocationsCache.set(data, perEntity);
+        }
+        const key = `${entity}\u0000${value}`;
+        let ids = perEntity.get(key);
+        if (!ids) {
+            ids = [];
+            for (const item of data.highlightsPerLocation) {
+                // NB: positionInCategories[entity] is a zero-based index, so the first occurrence is 0.
+                // Use a presence check (not truthiness) to avoid dropping that first occurrence.
+                const position = item.positionInCategories[entity];
+                if (position !== undefined && item.values.some(v => v === value))
+                    ids.push(position);
+            }
+            perEntity.set(key, ids);
+        }
+        return ids;
+    }
+    /** Memoized `getEntityLocations` results, dropped with the `PreviewData` they were computed from. */
+    entityLocationsCache = new WeakMap();
     /**
      * Send a message to the prewiew iFrame with the required data to retrieve HTML content for a specific highlight category
      *
@@ -4973,6 +4891,171 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.29", ngImpo
                 }]
         }], ctorParameters: () => [{ type: i0.DestroyRef }] });
 
+/**
+ * Cursor over the occurrences of an entity value highlighted in the preview.
+ *
+ * The number of occurrences is the one actually located in the preview (`PreviewService.getEntityLocations`),
+ * not the `count` of the indexed record, which can be greater (ES-32245).
+ */
+class EntityNavigationService {
+    previewService = inject(PreviewService);
+    lastPreviewData;
+    /** The current position, shared by the entities panels */
+    navigation = signal(undefined, ...(ngDevMode ? [{ debugName: "navigation" }] : []));
+    /** The value hovered in the panel */
+    hovering = signal(undefined, ...(ngDevMode ? [{ debugName: "hovering" }] : []));
+    /** The 1-based position of the hovered value, `0` when it is not the one being navigated */
+    hoverIndex = computed(() => (this.navigation()?.value === this.hovering() ? (this.navigation()?.index ?? 0) : 0), ...(ngDevMode ? [{ debugName: "hoverIndex" }] : []));
+    /**
+     * Number of occurrences of `value` highlighted in the preview.
+     * `fallback` (the indexed count) is only used while no preview is loaded.
+     */
+    total(entity, value, fallback = 0) {
+        if (!this.previewService.previewData)
+            return fallback;
+        return this.previewService.getEntityLocations(entity, value).length;
+    }
+    navigate(entity, value, direction) {
+        const ids = this.previewService.getEntityLocations(entity, value);
+        const total = ids.length;
+        if (total === 0) {
+            warn(`No highlighted occurrence for entity ${entity}:`, value);
+            notify.warning(`No occurrence of "${value}" can be reached in the document.`);
+            return;
+        }
+        // The cursor belongs to one document: start over when another preview has been loaded
+        if (this.lastPreviewData !== this.previewService.previewData) {
+            this.lastPreviewData = this.previewService.previewData;
+            this.navigation.set(undefined);
+        }
+        const current = this.navigation();
+        // Start from the first (next) or last (prev) occurrence when the value changes
+        const position = current?.value === value ? current.index : direction === "next" ? 0 : 1;
+        const index = ((position - 1 + (direction === "next" ? 1 : -1) + total) % total) + 1;
+        this.navigation.set({ value, index });
+        const id = ids[index - 1];
+        this.previewService.events.set("scrollTo");
+        this.previewService.sendMessage({ action: "select", id: `${entity}_${id}`, usePassageHighlighter: false });
+        debug(`${direction} navigation:`, { id, entity, value, index, total });
+    }
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.29", ngImport: i0, type: EntityNavigationService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
+    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.29", ngImport: i0, type: EntityNavigationService, providedIn: "root" });
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.29", ngImport: i0, type: EntityNavigationService, decorators: [{
+            type: Injectable,
+            args: [{ providedIn: "root" }]
+        }] });
+
+class JsonMethodPluginService {
+    http = inject(HttpClient);
+    API_URL = `${globalConfig.backendUrl}/api/v1`;
+    /**
+     * Call a JsonMethod plugin using an HTTP POST
+     *
+     * @param method The name of the JsonMethod plugin
+     * @param query Parameters to pass to the plugin
+     * @param options HTTP options for the request
+     * @returns An observable of the plugin's return value
+     */
+    post(method, query, options) {
+        if (!isObject(query)) {
+            return throwError(() => ({ error: 'invalid query object' }));
+        }
+        return this.http.post(`${this.API_URL}/plugin/${method}`, query, options);
+    }
+    /**
+     * Call a JsonMethod plugin using an HTTP GET
+     *
+     * @param method The name of the JsonMethod plugin
+     * @param query Parameters to pass to the plugin
+     * @param options HTTP options for the request
+     * @returns An observable of the plugin's return value
+     */
+    get(method, query, options) {
+        return this.http.get(`${this.API_URL}/plugin/${method}`, {
+            params: query,
+            ...options
+        });
+    }
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.29", ngImport: i0, type: JsonMethodPluginService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
+    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.29", ngImport: i0, type: JsonMethodPluginService, providedIn: 'root' });
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.29", ngImport: i0, type: JsonMethodPluginService, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }] });
+
+/**
+ * The route an audit event names: the path, without its leading slash, query string or fragment.
+ * `/search?q=irsn#p2` and `/search` are the same route — arriving on one from the other is a new
+ * query, not a navigation.
+ */
+function routeNameOf(url) {
+    return url.slice(1).split(/[?#]/)[0];
+}
+class NavigationService {
+    router = inject(Router);
+    auditService = inject(AuditService);
+    // The route of the previous navigation, used only to dedupe audit route-change notifications in
+    // navigationEnd$ below. Kept separate from urlAfterNavigation so that getter stays correct
+    // regardless of whether anything subscribes to navigationEnd$.
+    //
+    // It used to hold the full url (`/search?q=irsn`) while the comparison was against the bare route
+    // name (`search`): the two could never be equal, so the dedupe never fired and every navigation
+    // was audited — including the query-param changes that make up most of a search session.
+    previousRouteName = null;
+    /**
+     * The URL of the current navigation, used to redirect the user after login.
+     *
+     * Sourced directly from `Router.url`, which Angular keeps up to date on every navigation with no
+     * subscription required — unlike a field updated as a side effect of `navigationEnd$` below,
+     * which only happens for whoever actually subscribes to it.
+     *
+     * The authentication screens are never returned: sending someone back to `/logout` after they
+     * signed in defeats the sign-in, and back to `/login` loops. The exclusion used to be a literal
+     * `!== "/login"`, which let through `/logout`, `/login?mode=changepassword` — same screen, one
+     * query param — and any application whose `loginPath` is not spelled `/login`.
+     */
+    get urlAfterNavigation() {
+        const url = this.router.url;
+        return isAuthRoute(url, globalConfig.loginPath) ? null : url;
+    }
+    /**
+     * Observable that emits events of type `NavigationEnd` from the Angular Router.
+     *
+     * This observable performs the following operations:
+     * - Maps all router events to `RouterEvent`.
+     * - Filters the events to only include instances of `NavigationEnd`.
+     * - Taps into the event stream to notify the audit service when the route itself changes — a new
+     *   query, a filter or another page of results stays on the same route and is not one.
+     * - Shares the replayed value with a buffer size of 1 to ensure subscribers receive the latest emitted value.
+     *
+     * @type Observable<RouterEvent>
+     */
+    navigationEnd$ = this.router.events.pipe(map(event => event), filter$1((event) => event instanceof NavigationEnd), tap(event => {
+        const routeName = routeNameOf(event.url);
+        // The empty name is the application root, which has never been audited.
+        if (routeName && routeName !== this.previousRouteName) {
+            this.auditService.notifyRouteChange(routeName);
+        }
+        // Every route is remembered, the authentication screens included. Skipping them would swallow
+        // the return: leaving `/search` for `/login` and coming back is two route changes, and the
+        // second one would compare against a `search` the user has meanwhile left. (The exclusion that
+        // used to sit here never ran — the dedupe above it could not fire.)
+        this.previousRouteName = routeName;
+    }), shareReplay(1));
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.29", ngImport: i0, type: NavigationService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
+    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.29", ngImport: i0, type: NavigationService, providedIn: "root" });
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.29", ngImport: i0, type: NavigationService, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: "root"
+                }]
+        }] });
+
 /**
  * @deprecated This service is deprecated and should not be used directly. Please use the PrincipalStore instead.
 */
@@ -10281,12 +10364,13 @@ class ArticleEntities {
     cn = cn;
     appStore = inject(AppStore);
     previewService = inject(PreviewService);
+    entityNavigation = inject(EntityNavigationService);
     article = input.required(...(ngDevMode ? [{ debugName: "article" }] : []));
     previewHighlights = computed(() => {
         const highlights = this.appStore.getWebServiceByType("preview")?.highlights
             ?.split(",")
-            .filter((h) => h !== "extractslocations" && h !== "matchlocations" && h !== "matchingpassages");
-        return highlights?.map((highlight) => ({
+            .filter(h => h !== "extractslocations" && h !== "matchlocations" && h !== "matchingpassages");
+        return highlights?.map(highlight => ({
             name: highlight,
             entity: highlight,
             metadata: this.getMetadata(this.article(), highlight)
@@ -10296,54 +10380,24 @@ class ArticleEntities {
         const m = article[entity];
         return m ?? [];
     }
-    navigation = signal(undefined, ...(ngDevMode ? [{ debugName: "navigation" }] : []));
-    hovering = signal(undefined, ...(ngDevMode ? [{ debugName: "hovering" }] : []));
-    hoverIndex = computed(() => this.navigation()?.value === this.hovering() ? (this.navigation()?.index ?? 0) : 0, ...(ngDevMode ? [{ debugName: "hoverIndex" }] : []));
+    navigation = this.entityNavigation.navigation;
+    hovering = this.entityNavigation.hovering;
+    hoverIndex = this.entityNavigation.hoverIndex;
+    /** Number of occurrences of the entity value highlighted in the preview (not the indexed `count`, see ES-32245) */
+    total(entity, data) {
+        return this.entityNavigation.total(entity, data.value, data.count);
+    }
     scrollTo(type, index, usePassageHighlighter = false) {
         // if previewData contains "matchingpassages" then we use the passage highlighter otherwise we use "extractslocations"
         const category = type || this.previewService.highlightCategory;
         this.previewService.events.set("scrollTo");
         this.previewService.sendMessage({ action: "select", id: `${category}_${index}`, usePassageHighlighter });
     }
-    navigate(entity, data, direction) {
-        if (!data.count || data.count <= 0) {
-            warn(`Invalid count for entity ${entity}:`, data.count);
-            return;
-        }
-        const currentNavigation = this.navigation();
-        const isCurrentValue = currentNavigation?.value === data.value;
-        let newIndex;
-        if (direction === "next") {
-            newIndex = isCurrentValue && currentNavigation.index < data.count ? currentNavigation.index + 1 : 1;
-        }
-        else {
-            newIndex = isCurrentValue && currentNavigation.index > 1 ? currentNavigation.index - 1 : data.count;
-        }
-        this.navigation.set({
-            value: data.value,
-            index: newIndex
-        });
-        const id = this.previewService.getEntityId(entity, data.value, newIndex - 1);
-        if (id !== undefined) {
-            this.scrollTo(entity, id);
-            debug(`${direction} navigation:`, {
-                id,
-                entity,
-                value: data.value,
-                index: newIndex,
-                totalCount: data.count
-            });
-        }
-        else {
-            warn(`Unable to get ID for ${direction} navigation:`, { entity, value: data.value, index: newIndex });
-            notify.warning(`Unable to navigate to the ${direction} occurrence of "${data.value}".`);
-        }
-    }
     navigateNext(entity, data) {
-        this.navigate(entity, data, "next");
+        this.entityNavigation.navigate(entity, data.value, "next");
     }
     navigatePrev(entity, data) {
-        this.navigate(entity, data, "prev");
+        this.entityNavigation.navigate(entity, data.value, "prev");
     }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.29", ngImport: i0, type: ArticleEntities, deps: [], target: i0.ɵɵFactoryTarget.Component });
     static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "20.3.29", type: ArticleEntities, isStandalone: true, selector: "article-entities,ArticleEntities,articleentities", inputs: { article: { classPropertyName: "article", publicName: "article", isSignal: true, isRequired: true, transformFunction: null } }, ngImport: i0, template: `
@@ -10387,13 +10441,13 @@ class ArticleEntities {
                     <chevronleft />
                   </button>
 
-                  <span>{{ hoverIndex() }} / {{ data.count }}</span>
+                  <span>{{ hoverIndex() }} / {{ total(entity, data) }}</span>
 
                   <button class="hover:scale-125" aria-label="next entity" role="button" (click)="navigateNext(entity, data)">
                     <chevronright />
                   </button>
                 } @else {
-                  {{ data.count }}
+                  {{ total(entity, data) }}
                 }
               </p>
             </li>
@@ -10449,13 +10503,13 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.29", ngImpo
                     <chevronleft />
                   </button>
 
-                  <span>{{ hoverIndex() }} / {{ data.count }}</span>
+                  <span>{{ hoverIndex() }} / {{ total(entity, data) }}</span>
 
                   <button class="hover:scale-125" aria-label="next entity" role="button" (click)="navigateNext(entity, data)">
                     <chevronright />
                   </button>
                 } @else {
-                  {{ data.count }}
+                  {{ total(entity, data) }}
                 }
               </p>
             </li>
@@ -13654,12 +13708,13 @@ class EntitiesPanel {
     cn = cn;
     appStore = inject(AppStore);
     previewService = inject(PreviewService);
+    entityNavigation = inject(EntityNavigationService);
     article = input.required(...(ngDevMode ? [{ debugName: "article" }] : []));
     previewHighlights = computed(() => {
         const highlights = this.appStore.getWebServiceByType("preview")?.highlights
             ?.split(",")
-            .filter((h) => h !== "extractslocations" && h !== "matchlocations" && h !== "matchingpassages");
-        return highlights?.map((highlight) => ({
+            .filter(h => h !== "extractslocations" && h !== "matchlocations" && h !== "matchingpassages");
+        return highlights?.map(highlight => ({
             name: highlight,
             entity: highlight,
             metadata: this.getMetadata(this.article(), highlight)
@@ -13669,54 +13724,24 @@ class EntitiesPanel {
         const m = article[entity];
         return m ?? [];
     }
-    navigation = signal(undefined, ...(ngDevMode ? [{ debugName: "navigation" }] : []));
-    hovering = signal(undefined, ...(ngDevMode ? [{ debugName: "hovering" }] : []));
-    hoverIndex = computed(() => this.navigation()?.value === this.hovering() ? (this.navigation()?.index ?? 0) : 0, ...(ngDevMode ? [{ debugName: "hoverIndex" }] : []));
+    navigation = this.entityNavigation.navigation;
+    hovering = this.entityNavigation.hovering;
+    hoverIndex = this.entityNavigation.hoverIndex;
+    /** Number of occurrences of the entity value highlighted in the preview (not the indexed `count`, see ES-32245) */
+    total(entity, data) {
+        return this.entityNavigation.total(entity, data.value, data.count);
+    }
     scrollTo(type, index, usePassageHighlighter = false) {
         // if previewData contains "matchingpassages" then we use the passage highlighter otherwise we use "extractslocations"
         const category = type || this.previewService.highlightCategory;
         this.previewService.events.set("scrollTo");
         this.previewService.sendMessage({ action: "select", id: `${category}_${index}`, usePassageHighlighter });
     }
-    navigate(entity, data, direction) {
-        if (!data.count || data.count <= 0) {
-            warn(`Invalid count for entity ${entity}:`, data.count);
-            return;
-        }
-        const currentNavigation = this.navigation();
-        const isCurrentValue = currentNavigation?.value === data.value;
-        let newIndex;
-        if (direction === "next") {
-            newIndex = isCurrentValue && currentNavigation.index < data.count ? currentNavigation.index + 1 : 1;
-        }
-        else {
-            newIndex = isCurrentValue && currentNavigation.index > 1 ? currentNavigation.index - 1 : data.count;
-        }
-        this.navigation.set({
-            value: data.value,
-            index: newIndex
-        });
-        const id = this.previewService.getEntityId(entity, data.value, newIndex - 1);
-        if (id !== undefined) {
-            this.scrollTo(entity, id);
-            debug(`${direction} navigation:`, {
-                id,
-                entity,
-                value: data.value,
-                index: newIndex,
-                totalCount: data.count
-            });
-        }
-        else {
-            warn(`Unable to get ID for ${direction} navigation:`, { entity, value: data.value, index: newIndex });
-            notify.warning(`Unable to navigate to the ${direction} occurrence of "${data.value}".`);
-        }
-    }
     navigateNext(entity, data) {
-        this.navigate(entity, data, "next");
+        this.entityNavigation.navigate(entity, data.value, "next");
     }
     navigatePrev(entity, data) {
-        this.navigate(entity, data, "prev");
+        this.entityNavigation.navigate(entity, data.value, "prev");
     }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.29", ngImport: i0, type: EntitiesPanel, deps: [], target: i0.ɵɵFactoryTarget.Component });
     static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "20.3.29", type: EntitiesPanel, isStandalone: true, selector: "entities-panel,EntitiesPanel,entitiesPanel", inputs: { article: { classPropertyName: "article", publicName: "article", isSignal: true, isRequired: true, transformFunction: null } }, ngImport: i0, template: `
@@ -13760,13 +13785,13 @@ class EntitiesPanel {
                     <chevronleft />
                   </button>
 
-                  <span>{{ hoverIndex() }} / {{ data.count }}</span>
+                  <span>{{ hoverIndex() }} / {{ total(entity, data) }}</span>
 
                   <button class="hover:scale-125" aria-label="next entity" role="button" (click)="navigateNext(entity, data)">
                     <chevronright />
                   </button>
                 } @else {
-                  {{ data.count }}
+                  {{ total(entity, data) }}
                 }
               </p>
             </li>
@@ -13822,13 +13847,13 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.29", ngImpo
                     <chevronleft />
                   </button>
 
-                  <span>{{ hoverIndex() }} / {{ data.count }}</span>
+                  <span>{{ hoverIndex() }} / {{ total(entity, data) }}</span>
 
                   <button class="hover:scale-125" aria-label="next entity" role="button" (click)="navigateNext(entity, data)">
                     <chevronright />
                   </button>
                 } @else {
-                  {{ data.count }}
+                  {{ total(entity, data) }}
                 }
               </p>
             </li>
@@ -18228,6 +18253,42 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.29", ngImpo
   `, styles: [":host ul{scrollbar-width:thin}\n"] }]
         }], ctorParameters: () => [], propDecorators: { options: [{ type: i0.Input, args: [{ isSignal: true, alias: "options", required: false }] }] } });
 
+/** Whether a value is an object (an array excluded): a structure, which this form cannot edit. */
+const isPlainObject = (value) => value !== null && typeof value === "object" && !Array.isArray(value);
+/**
+ * Normalizes `features.userProfile.customData`, as written in the custom JSON, into a flat list.
+ *
+ * Two entry shapes are accepted and can be mixed:
+ * - `"nickname"` — a property without default;
+ * - `{ "nickname": "none" }` — a property and its default value. An object with several keys declares
+ *   one property per key.
+ *
+ * The JSON is read at run time and nothing validates it, so an entry that is neither a string nor a
+ * plain object is dropped, with a warning, rather than thrown on. When a key is declared twice, the
+ * first declaration wins.
+ */
+function normalizeCustomData(entries) {
+    const properties = new Map();
+    const add = (key, value) => {
+        if (!key || properties.has(key)) {
+            return;
+        }
+        properties.set(key, value === undefined || value === null ? { key } : { key, defaultValue: value });
+    };
+    for (const entry of Array.isArray(entries) ? entries : []) {
+        if (typeof entry === "string") {
+            add(entry);
+        }
+        else if (isPlainObject(entry)) {
+            Object.entries(entry).forEach(([key, value]) => add(key, value));
+        }
+        else {
+            console.warn("[user-profile] customData: entry ignored, expected a string or an object.", entry);
+        }
+    }
+    return [...properties.values()];
+}
+
 const SUPPORTED_LANGUAGES = ["en", "fr", "de"];
 class UserProfileFormComponent {
     principalStore = inject(PrincipalStore);
@@ -18258,7 +18319,17 @@ class UserProfileFormComponent {
         { code: "de", label: "Deutsch", icon: FlagGermanIcon }
     ];
     changingPassword = signal(false, ...(ngDevMode ? [{ debugName: "changingPassword" }] : []));
-    customData = computed(() => (this.appStore.general()?.features?.userProfile?.customData || []).filter(key => !this.keys().some(k => k.toLowerCase() === key.toLowerCase())), ...(ngDevMode ? [{ debugName: "customData" }] : []));
+    customDataConfig = computed(() => normalizeCustomData(this.appStore.general()?.features?.userProfile?.customData), ...(ngDevMode ? [{ debugName: "customDataConfig" }] : []));
+    /**
+     * The editable custom properties. A property that already holds an object in the profile (hierarchical
+     * `customData`) is left out: this form edits scalars only and would overwrite the structure.
+     */
+    customData = computed(() => {
+        const stored = this.userProfile()?.customData;
+        return this.customDataConfig()
+            .map(({ key }) => key)
+            .filter(key => !this.keys().some(k => k.toLowerCase() === key.toLowerCase()) && !isPlainObject(stored?.[key]));
+    }, ...(ngDevMode ? [{ debugName: "customData" }] : []));
     allowChangePassword = computed(() => {
         const { useCredentials } = globalConfig;
         const { allowChangePassword = false } = this.appStore.general()?.features || {};
@@ -18308,8 +18379,7 @@ class UserProfileFormComponent {
      * @param propertyName property name
      */
     onEdit(category, propertyName) {
-        const data = this.userProfile()?.[category];
-        const value = data?.[propertyName];
+        const value = this.getDataValue(category, propertyName);
         this.feedback.set(undefined);
         this.value.set(value?.trim() || "");
         this.propertyToEdit.set(`${category}.${propertyName}`);
@@ -18420,6 +18490,10 @@ class UserProfileFormComponent {
     getDataValue(category, key) {
         const data = this.userProfile()?.[category];
         const value = data?.[key];
+        if (value === undefined && category === "customData") {
+            const defaultValue = this.customDataConfig().find(property => property.key === key)?.defaultValue;
+            return defaultValue === undefined || typeof defaultValue === "object" ? undefined : String(defaultValue);
+        }
         return value;
     }
     /**
@@ -18747,5 +18821,5 @@ const queryNameResolver = () => {
  * Generated bundle index. Do not edit.
  */
 
-export { AGGREGATIONS_NAMES, AGGREGATIONS_NAMES_PRESET_DEFAULT, APP_FEATURES, AdvancedFiltersComponent, AdvancedSearch, AdvancedSearchComponent, AggregationComponent, AggregationDateComponent, AggregationDateRangeDialogComponent, AggregationItemDirective, AggregationListComponent, AggregationPanelComponent, AggregationTreeComponent, AggregationsService, AggregationsStore, Alert, AlertDialog, AlertsComponent, AppService, AppStore, ApplicationService, ApplicationStore, ArticleEntities, ArticleExtracts, ArticleLabels, ArticleSimilarDocuments, AsideFiltersComponent, AuditFeedbackType, AuditService, AuthGuard, AuthPageComponent, AutocompleteService, BOOKMARKS_CONFIG, BOOKMARKS_OPTIONS, BackdropComponent, BackdropService, BookmarkButtonComponent, BookmarksComponent, COLLECTIONS_CONFIG, COLLECTIONS_OPTIONS, COMPONENTS_FOR_DOCUMENT_TYPE, ChangePasswordComponent, ChildMarkerDirective, CollectionsComponent, CollectionsDialog, DRAWER_COMPONENT, DRAWER_STACK_MAX_COUNT, DateComponent, DeleteCollectionDialog, DidYouMeanComponent, DocumentLocatorComponent, DrawerAdvancedFiltersComponent, DrawerComponent, DrawerNavbarComponent, DrawerPreviewComponent, DrawerService, DrawerStackComponent, DrawerStackService, DropdownInputComponent, DropdownListComponent, ErrorComponent, ExportDialog, ExportService, FILTERS_BREAKPOINT, FILTER_DATE_ALLOW_CUSTOM_RANGE, FeatureFlagsDialogComponent, FeedbackDialogComponent, FileSizePipe, FilterButtonComponent, FiltersBarComponent, HIGHLIGHTS, HighlightWordPipe, InfinityScrollDirective, InlineWorker, JsonMethodPluginService, KeyboardNavigatorDirective, LabelService, LabelsEditDialog, LoadingComponent, MetadataComponent, MissingTermsComponent, MoreButtonComponent, MoreComponent, MultiSelectLabelsComponent, MultiSelectionToolbarComponent, NON_SEARCHABLE_COLUMNS, NON_SEARCHABLE_DEFAULTS, NavbarTabsComponent, NavigationService, NoResultComponent, OpenArticleOnCtrlEnterDirective, OperatorPipe, OverflowItemDirective, OverflowManagerDirective, OverflowStopDirective, OverrideUserDialogComponent, PREVIEW_CONFIG, PagerComponent, PreviewNavigator, PreviewService, PrincipalService, PrincipalStore, QueryParamsStore, QueryService, RECENT_SEARCHES_CONFIG, RECENT_SEARCHES_OPTIONS, ROUTE_COMPONENTS, RecentSearchesComponent, ResetUserSettingsDialogComponent, SAVED_SEARCHES_CONFIG, SAVED_SEARCHES_OPTIONS, SavedSearchDialog, SavedSearchesComponent, SavedSearchesService, SearchFeedbackComponent, SearchInputFooter, SearchService, SelectArticleDirective, SelectArticleOnClickDirective, SelectionHistoryService, SelectionService, SelectionStore, ShowBookmarkDirective, SidebarNavComponent, SignInComponent, SignedOutComponent, SortSelectorComponent, SourceComponent, SourceIconPipe, SponsoredResultsComponent, SyslangPipe, THEMES, TextChunkService, ThemeProviderDirective, ThemeSelectorComponent, ThemeStore, ThemeToggleComponent, TranslocoDateImpurePipe, UserProfileDialog, UserProfileFormComponent, UserProfileService, UserSettingsStore, __resetSignInMutexForTests, applyThemeToNativeElement, auditInterceptorFn, authInterceptorFn, bodyInterceptorFn, bootstrapApp, buildQuery, debouncedSignal, errorInterceptorFn, getCurrentPath, getCurrentQueryName, getQueryNameFromRoute, injectRouteNavigation, isAuthRoute, isSignInInFlight, legacyFilterToFilter, processCssVars, queryNameResolver, signIn, themeColorNameToCssVariable, themeColorsToCssVariables, toastInterceptorFn, withAggregationsFeatures, withAlertsFeatures, withAppFeatures, withApplicationFeatures, withAssistantFeatures, withBasketsFeatures, withBookmarkFeatures, withBootstrapApp, withExtractsFeatures, withFetch, withMultiSelectionFeatures, withQueryParamsFeatures, withRecentSearchesFeatures, withSavedSearchesFeatures, withSelectionFeatures, withThemeBodyHook, withThemes, withThemesFeatures, withUserSettingsFeatures };
+export { AGGREGATIONS_NAMES, AGGREGATIONS_NAMES_PRESET_DEFAULT, APP_FEATURES, AdvancedFiltersComponent, AdvancedSearch, AdvancedSearchComponent, AggregationComponent, AggregationDateComponent, AggregationDateRangeDialogComponent, AggregationItemDirective, AggregationListComponent, AggregationPanelComponent, AggregationTreeComponent, AggregationsService, AggregationsStore, Alert, AlertDialog, AlertsComponent, AppService, AppStore, ApplicationService, ApplicationStore, ArticleEntities, ArticleExtracts, ArticleLabels, ArticleSimilarDocuments, AsideFiltersComponent, AuditFeedbackType, AuditService, AuthGuard, AuthPageComponent, AutocompleteService, BOOKMARKS_CONFIG, BOOKMARKS_OPTIONS, BackdropComponent, BackdropService, BookmarkButtonComponent, BookmarksComponent, COLLECTIONS_CONFIG, COLLECTIONS_OPTIONS, COMPONENTS_FOR_DOCUMENT_TYPE, ChangePasswordComponent, ChildMarkerDirective, CollectionsComponent, CollectionsDialog, DRAWER_COMPONENT, DRAWER_STACK_MAX_COUNT, DateComponent, DeleteCollectionDialog, DidYouMeanComponent, DocumentLocatorComponent, DrawerAdvancedFiltersComponent, DrawerComponent, DrawerNavbarComponent, DrawerPreviewComponent, DrawerService, DrawerStackComponent, DrawerStackService, DropdownInputComponent, DropdownListComponent, EntityNavigationService, ErrorComponent, ExportDialog, ExportService, FILTERS_BREAKPOINT, FILTER_DATE_ALLOW_CUSTOM_RANGE, FeatureFlagsDialogComponent, FeedbackDialogComponent, FileSizePipe, FilterButtonComponent, FiltersBarComponent, HIGHLIGHTS, HighlightWordPipe, InfinityScrollDirective, InlineWorker, JsonMethodPluginService, KeyboardNavigatorDirective, LabelService, LabelsEditDialog, LoadingComponent, MetadataComponent, MissingTermsComponent, MoreButtonComponent, MoreComponent, MultiSelectLabelsComponent, MultiSelectionToolbarComponent, NON_SEARCHABLE_COLUMNS, NON_SEARCHABLE_DEFAULTS, NavbarTabsComponent, NavigationService, NoResultComponent, OpenArticleOnCtrlEnterDirective, OperatorPipe, OverflowItemDirective, OverflowManagerDirective, OverflowStopDirective, OverrideUserDialogComponent, PREVIEW_CONFIG, PagerComponent, PreviewNavigator, PreviewService, PrincipalService, PrincipalStore, QueryParamsStore, QueryService, RECENT_SEARCHES_CONFIG, RECENT_SEARCHES_OPTIONS, ROUTE_COMPONENTS, RecentSearchesComponent, ResetUserSettingsDialogComponent, SAVED_SEARCHES_CONFIG, SAVED_SEARCHES_OPTIONS, SavedSearchDialog, SavedSearchesComponent, SavedSearchesService, SearchFeedbackComponent, SearchInputFooter, SearchService, SelectArticleDirective, SelectArticleOnClickDirective, SelectionHistoryService, SelectionService, SelectionStore, ShowBookmarkDirective, SidebarNavComponent, SignInComponent, SignedOutComponent, SortSelectorComponent, SourceComponent, SourceIconPipe, SponsoredResultsComponent, SyslangPipe, THEMES, TextChunkService, ThemeProviderDirective, ThemeSelectorComponent, ThemeStore, ThemeToggleComponent, TranslocoDateImpurePipe, UserProfileDialog, UserProfileFormComponent, UserProfileService, UserSettingsStore, __resetSignInMutexForTests, applyThemeToNativeElement, auditInterceptorFn, authInterceptorFn, bodyInterceptorFn, bootstrapApp, buildQuery, debouncedSignal, errorInterceptorFn, getCurrentPath, getCurrentQueryName, getQueryNameFromRoute, injectRouteNavigation, isAuthRoute, isSignInInFlight, legacyFilterToFilter, processCssVars, queryNameResolver, signIn, themeColorNameToCssVariable, themeColorsToCssVariables, toastInterceptorFn, withAggregationsFeatures, withAlertsFeatures, withAppFeatures, withApplicationFeatures, withAssistantFeatures, withBasketsFeatures, withBookmarkFeatures, withBootstrapApp, withExtractsFeatures, withFetch, withMultiSelectionFeatures, withQueryParamsFeatures, withRecentSearchesFeatures, withSavedSearchesFeatures, withSelectionFeatures, withThemeBodyHook, withThemes, withThemesFeatures, withUserSettingsFeatures };
 //# sourceMappingURL=sinequa-atomic-angular.mjs.map