@sinequa/atomic-angular 1.14.0 → 1.14.1

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, 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, 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 { 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';
@@ -3526,7 +3526,7 @@ class AggregationsService {
             else {
                 // get current filters for the aggregation
                 const filters = this.queryParamsStore.getFilter({ field: agg.column, name: agg.name });
-                flattenedValues = filters ? this.flattenFilters([filters]) : [];
+                flattenedValues = filters ? flattenLegacyFilterValues([filters]) : [];
             }
             if (agg.isTree) {
                 const selectedAgg = agg.items.map(item => this.selectNode(item, flattenedValues));
@@ -3563,34 +3563,44 @@ class AggregationsService {
      */
     toFilter(item, field, name, isDistribution) {
         if (isDistribution) {
-            const res = item.value.match(/.*:\(?([><=\d\-.AND ]+)\)?/);
-            if (res?.[1]) {
-                const expr = res?.[1].split(" AND ");
-                const filters = expr.map(e => {
-                    const operator = e.indexOf(">=") !== -1 ? "gte" : "lt";
-                    const value = e.substring(e.indexOf(" ") + 1);
-                    return { name, field, operator, value, display: item.display || item.value };
-                });
-                if (filters.length === 2) {
-                    return {
-                        operator: "and",
-                        filters,
-                        display: filters[0].display || filters[0].value,
-                        field,
-                        name
-                    };
-                }
-                else if (filters.length === 1) {
-                    return { ...filters[0], field, name };
-                }
-                throw new Error("Failed to parse distribution expression");
+            // Parsing lives in @sinequa/atomic — `filter.distribution` is the single implementation, and it
+            // recognises all four bounds where this method only ever produced `gte` or `lt`, reading `>` as
+            // `gte` and `<=` as `lt`. What is added here is what the store needs and a `Filter` has no room
+            // for: the aggregation's `name` on every leaf, which is what makes `updateFilter` replace the
+            // entry rather than merge into it, and the human-readable `display`.
+            const parsed = filter.distribution(field, item.value);
+            if (parsed) {
+                return this.nameLeaves(parsed, field, name, item.display || String(item.value ?? ""));
             }
+            throw new Error("Failed to parse distribution expression");
         }
         if (typeof item.value === "string") {
             return { name, field, value: item.value, operator: "contains", display: item.display };
         }
         return { name, field, value: item.value, display: item.display };
     }
+    /**
+     * Stamps the aggregation's `name` and the item's `display` onto a filter parsed by
+     * `filter.distribution`.
+     *
+     * A `Filter` carries neither, and the store needs both: `name` is what
+     * `QueryParamsStore.updateFilter` matches on to **replace** an aggregation's entry instead of merging
+     * into it — the only way a selection can shrink — and `display` is the label the applied-filter chips
+     * render. A combined filter also keeps `field` at its root, which is how the store finds the entry.
+     */
+    nameLeaves(parsed, field, name, display) {
+        const leaves = parsed.filters;
+        if (leaves?.length) {
+            return {
+                ...parsed,
+                field,
+                name,
+                display,
+                filters: leaves.map(leaf => ({ ...leaf, field, name, display }))
+            };
+        }
+        return { ...parsed, field, name, display };
+    }
     findNode(items, path = "") {
         if (!items || items.length === 0) {
             return undefined;
@@ -3638,27 +3648,6 @@ class AggregationsService {
         }
         return node;
     }
-    flattenFilters(filters) {
-        const flattenedValues = [];
-        function extractValues(filters) {
-            for (const filter of filters) {
-                if (filter.value) {
-                    flattenedValues.push(filter.value);
-                    if (filter.display)
-                        flattenedValues.push(filter.display);
-                    // we handle "values" field for trees
-                }
-                else if (filter.values) {
-                    flattenedValues.push(...filter.values);
-                }
-                if (filter.filters) {
-                    extractValues(filter.filters);
-                }
-            }
-        }
-        extractValues(filters);
-        return flattenedValues;
-    }
     /**
      * Recursively opens parent nodes in a tree structure if any of their child nodes are selected or opened.
      *
@@ -5397,6 +5386,12 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.29", ngImpo
 
 class UserProfileService {
     API_URL = `${globalConfig.backendUrl}/api/v2/user-profile`;
+    // Keyed by the userId signal's identity rather than its value: every current caller
+    // passes the same PrincipalStore.userId signal, so sharing the resource here collapses
+    // what would otherwise be one httpResource (and one HTTP request) per caller into one
+    // for the whole app -- and lets a `.set()` from one consumer (e.g. the profile edit
+    // form) show up everywhere else that reads this resource.
+    resources = new WeakMap();
     /**
      * Retrieves the user profile by user ID.
      *
@@ -5404,11 +5399,16 @@ class UserProfileService {
      * @returns An Observable that emits an the UserProfile object.
      */
     getUserProfile(userId) {
-        return httpResource(() => (userId() ? `${this.API_URL}/${userId()}` : undefined), {
-            parse: (response) => {
-                return response;
-            }
-        });
+        let resource = this.resources.get(userId);
+        if (!resource) {
+            resource = httpResource(() => (userId() ? `${this.API_URL}/${userId()}` : undefined), {
+                parse: response => {
+                    return response;
+                }
+            });
+            this.resources.set(userId, resource);
+        }
+        return resource;
     }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.29", ngImport: i0, type: UserProfileService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
     static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.29", ngImport: i0, type: UserProfileService, providedIn: "root" });
@@ -9475,41 +9475,57 @@ function injectAggregationBase(refs) {
     }
     function addCurrentFiltersToItems(aggregation) {
         const currentItems = aggregation?.items || [];
-        if (!aggregation?.isTree && !aggregation?.isDistribution) {
-            const currentFilters = isControlled() ? selectionAsFilter() : queryParamsStore.getFilter({ field: aggregation?.column, name: aggregation?.name });
-            if (currentFilters) {
-                if (Array.isArray(currentFilters.filters) && currentFilters.filters.length) {
-                    currentFilters.filters.forEach((filter) => {
-                        const found = currentItems.find(item => item.value?.toString().toLocaleLowerCase() === filter.value?.toLocaleLowerCase());
-                        if (!found) {
-                            currentItems.unshift({ value: filter.value, display: filter.display, $selected: true });
-                        }
-                        else {
-                            found.$selected = true;
-                        }
-                    });
+        if (aggregation?.isTree) {
+            return currentItems;
+        }
+        const currentFilters = isControlled() ? selectionAsFilter() : queryParamsStore.getFilter({ field: aggregation?.column, name: aggregation?.name });
+        if (aggregation?.isDistribution) {
+            // A distribution item's `value` is the full backend expression (e.g.
+            // `size`10 Kb to 100 Kb`:(>= 10240 AND < 102400)`), not comparable to what the applied
+            // filter stores — its leaves only ever carry the bucket's numeric thresholds. Flatten the
+            // filter and compare on `display` instead (or `value` when `valuesAreExpressions` is not
+            // set) — same strategy as `AggregationsService.enrichAggregation`.
+            const flattenedValues = currentFilters ? flattenLegacyFilterValues([currentFilters]) : [];
+            currentItems.forEach(item => {
+                const valueToSearch = aggregation.valuesAreExpressions ? item.display : item.value;
+                if (flattenedValues.includes(valueToSearch?.toString() ?? "")) {
+                    item.$selected = true;
                 }
-                else if (Array.isArray(currentFilters.values) && currentFilters.values.length) {
-                    // multiple values stored as a string array, e.g. { values: ["alice_martin", "caroline_dubois"] }
-                    // (no `filters` sub-array and no single `value`) — mark each matching item as selected
-                    currentFilters.values.forEach(value => {
-                        const found = currentItems.find(item => item.value?.toString().toLocaleLowerCase() === value?.toString().toLocaleLowerCase());
-                        if (!found) {
-                            currentItems.unshift({ value, display: value, $selected: true });
-                        }
-                        else {
-                            found.$selected = true;
-                        }
-                    });
-                }
-                else if (currentFilters.value) {
-                    const found = currentItems.find(item => item.value?.toString().toLocaleLowerCase() === currentFilters.value?.toLocaleLowerCase());
+            });
+            return currentItems;
+        }
+        if (currentFilters) {
+            if (Array.isArray(currentFilters.filters) && currentFilters.filters.length) {
+                currentFilters.filters.forEach((filter) => {
+                    const found = currentItems.find(item => item.value?.toString().toLocaleLowerCase() === filter.value?.toLocaleLowerCase());
                     if (!found) {
-                        currentItems.push({ value: currentFilters.value, display: currentFilters.display, $selected: true });
+                        currentItems.unshift({ value: filter.value, display: filter.display, $selected: true });
                     }
                     else {
                         found.$selected = true;
                     }
+                });
+            }
+            else if (Array.isArray(currentFilters.values) && currentFilters.values.length) {
+                // multiple values stored as a string array, e.g. { values: ["alice_martin", "caroline_dubois"] }
+                // (no `filters` sub-array and no single `value`) — mark each matching item as selected
+                currentFilters.values.forEach(value => {
+                    const found = currentItems.find(item => item.value?.toString().toLocaleLowerCase() === value?.toString().toLocaleLowerCase());
+                    if (!found) {
+                        currentItems.unshift({ value, display: value, $selected: true });
+                    }
+                    else {
+                        found.$selected = true;
+                    }
+                });
+            }
+            else if (currentFilters.value) {
+                const found = currentItems.find(item => item.value?.toString().toLocaleLowerCase() === currentFilters.value?.toLocaleLowerCase());
+                if (!found) {
+                    currentItems.push({ value: currentFilters.value, display: currentFilters.display, $selected: true });
+                }
+                else {
+                    found.$selected = true;
                 }
             }
         }
@@ -15598,6 +15614,15 @@ class AggregationListComponent {
         const filters = this.queryParamsStore.getFilter({ field: field ?? undefined, name: this.listItemName(item) });
         if (!filters)
             return false;
+        const agg = this.aggregation();
+        if (agg?.isDistribution) {
+            // Same reasoning as `injectAggregationBase.addCurrentFiltersToItems`: a distribution item's
+            // `value` is the full backend expression, not comparable to the applied filter's stored
+            // thresholds — flatten it and compare on `display` (or `value` without `valuesAreExpressions`).
+            const flattenedValues = flattenLegacyFilterValues([filters]);
+            const valueToSearch = agg.valuesAreExpressions ? item.display : item.value;
+            return flattenedValues.includes(valueToSearch?.toString() ?? "");
+        }
         const values = [item.value];
         return values.some(v => v === filters.value) || !!(filters.values?.length && filters.values.some((value) => values.some(v => v === value)));
     }