@sinequa/atomic-angular 1.7.0 → 1.7.2

package/fesm2022/sinequa-atomic-angular.mjs

@@ -1861,7 +1861,10 @@ function withQueryParamsFeatures() {
                 return { ...state, path, text, filters, id, page, sort, spellingCorrectionMode, tab, basket, name };
             });
         },
-        _updateUrlQueryParams(state, audit) {
+        _updateUrlQueryParams(state, audit, options) {
+            // Opting out of URL sync keeps the store state authoritative without navigating.
+            if (options?.syncUrl === false)
+                return;
             const { filters, page, sort, tab, text, basket, name } = state;
             const queryParams = {
                 f: filters && filters.length > 0 ? JSON.stringify(filters) : undefined,
@@ -1893,8 +1896,8 @@ function withQueryParamsFeatures() {
          *
          * The function calls the `updateFilter` method to add the filter to the state.
          */
-        addFilter(filter, audit) {
-            this.updateFilter(filter, audit);
+        addFilter(filter, audit, options) {
+            this.updateFilter(filter, audit, options);
         },
         /**
          * Updates the filter in the store's state.
@@ -1986,9 +1989,7 @@ function withQueryParamsFeatures() {
                         }
                     }
                 }
-                if (options?.syncUrl !== false) {
-                    this._updateUrlQueryParams(newState || state, audit);
-                }
+                this._updateUrlQueryParams(newState || state, audit, options);
                 return newState || state;
             });
         },
@@ -2003,9 +2004,7 @@ function withQueryParamsFeatures() {
             patchState(store, (state) => {
                 const filters = state.filters?.filter((f) => f.field !== field);
                 const newState = { ...state, filters };
-                if (options?.syncUrl !== false) {
-                    this._updateUrlQueryParams(newState);
-                }
+                this._updateUrlQueryParams(newState, undefined, options);
                 return newState;
             });
         },
@@ -2025,9 +2024,7 @@ function withQueryParamsFeatures() {
             patchState(store, (state) => {
                 const filters = state.filters?.filter((f) => f.name !== name);
                 const newState = { ...state, filters };
-                if (options?.syncUrl !== false) {
-                    this._updateUrlQueryParams(newState);
-                }
+                this._updateUrlQueryParams(newState, undefined, options);
                 return newState;
             });
         },
@@ -2038,10 +2035,10 @@ function withQueryParamsFeatures() {
          * along with the basket going undefined
          * It uses the `patchState` function to apply the state change.
          */
-        clearFilters() {
+        clearFilters(options) {
             patchState(store, (state) => {
                 const newState = { ...state, filters: [], basket: undefined };
-                this._updateUrlQueryParams(newState);
+                this._updateUrlQueryParams(newState, undefined, options);
                 return newState;
             });
         },
@@ -2051,10 +2048,10 @@ function withQueryParamsFeatures() {
          * This method updates the state by setting the `basket` property to undefined.
          * It uses the `patchState` function to apply the state change.
          */
-        clearBasket() {
+        clearBasket(options) {
             patchState(store, (state) => {
                 const newState = { ...state, basket: undefined };
-                this._updateUrlQueryParams(newState);
+                this._updateUrlQueryParams(newState, undefined, options);
                 return newState;
             });
         },
@@ -2063,12 +2060,12 @@ function withQueryParamsFeatures() {
          *
          * @param params - A partial object containing the query parameters to be updated.
          */
-        patch(params, audit) {
+        patch(params, audit, options) {
             patchState(store, (state) => {
                 // get the hash path without the query params and without the leading '#'
                 const path = window.location.hash.split("?")[0].replace(/^#/, "");
                 const newState = { ...state, ...params, path };
-                this._updateUrlQueryParams(newState, audit);
+                this._updateUrlQueryParams(newState, audit, options);
                 return newState;
             });
         },
@@ -2893,7 +2890,7 @@ function withSavedSearchesFeatures() {
                 return { ...state, savedSearches: [...savedSearches] };
             });
         },
-        getSavedSearch(search) {
+        getSavedSearch(search, tab) {
             if (!search)
                 return undefined;
             const savedSearches = store.savedSearches();
@@ -2902,7 +2899,15 @@ function withSavedSearchesFeatures() {
                 if (!queryParams)
                     return false;
                 const q = queryParams.split('&').find(qp => qp.startsWith('q='));
-                return !!q && decodeURI(q.substring(2)) === search;
+                const qMatch = !!q && decodeURI(q.substring(2)) === search;
+                if (!qMatch)
+                    return false;
+                // If tab is provided, check it; otherwise accept any tab
+                if (tab) {
+                    const t = queryParams.split('&').find(qp => qp.startsWith('t='));
+                    return !!t && decodeURI(t.substring(2)) === tab;
+                }
+                return true;
             });
         }
     })));
@@ -4721,9 +4726,10 @@ class SavedSearchesService {
      *
      * @throws {Error} If saving an empty search is attempted.
      */
-    saveSearch(saveName) {
-        const { text } = getState(this.queryParamsStore);
+    saveSearch(saveName, saveTab) {
+        const { text, tab } = getState(this.queryParamsStore);
         const display = saveName || text;
+        const tabName = saveTab || tab;
         if (!display) {
             console.error("Saving empty search is not allowed");
             return;
@@ -4731,6 +4737,7 @@ class SavedSearchesService {
         const savedSearch = {
             url: window.location.hash.substring(1),
             date: new Date().toISOString(),
+            tab: tabName,
             display
         };
         const savedSearches = this.userSettingsStore.savedSearches();
@@ -5734,9 +5741,7 @@ class CollectionsDialog {
     closed = output();
     createInputElement = viewChild("createInput", ...(ngDevMode ? [{ debugName: "createInputElement" }] : []));
     dialogElement = viewChild(DialogComponent, ...(ngDevMode ? [{ debugName: "dialogElement" }] : []));
-    queryParamStore = inject(QueryParamsStore);
     userSettingsStore = inject(UserSettingsStore);
-    collection = signal(undefined, ...(ngDevMode ? [{ debugName: "collection" }] : []));
     article = signal([], ...(ngDevMode ? [{ debugName: "article" }] : []));
     newCollectionName = signal("", ...(ngDevMode ? [{ debugName: "newCollectionName" }] : []));
     creating = signal(false, ...(ngDevMode ? [{ debugName: "creating" }] : []));
@@ -5753,8 +5758,6 @@ class CollectionsDialog {
             this.article.set([article]);
         else
             this.article.set(article);
-        const { basket } = getState(this.queryParamStore);
-        this.collection.set(basket);
         this.dialogElement()?.showModal();
     }
     containsArticleByName(collectionName) {
@@ -5803,6 +5806,7 @@ class CollectionsDialog {
             // remove it
             const articleIds = this.article().map((a) => a.id);
             collection.ids = collection.ids?.filter((id) => !articleIds.includes(id)) ?? [];
+            this.removedFromCollection.set(true);
         }
         else {
             // add it
@@ -5814,8 +5818,6 @@ class CollectionsDialog {
         }
         try {
             await this.userSettingsStore.updateBasket(collection, collectionIndex);
-            const currentCollection = this.collection();
-            this.removedFromCollection.set(!!currentCollection && !this.containsArticleByName(currentCollection));
         }
         catch (e) {
             error("Error updating collection:", e);
@@ -15269,7 +15271,7 @@ class FiltersBarComponent {
       @if (currentBasket()) {
         <button
           variant="destructive"
-          class="max-w-40 size-9"
+          class="max-w-40 h-9"
           role="listitem"
           [title]="'filters.clearBasket' | transloco"
           (click)="clearBasket()"
@@ -15341,7 +15343,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.25", ngImpo
       @if (currentBasket()) {
         <button
           variant="destructive"
-          class="max-w-40 size-9"
+          class="max-w-40 h-9"
           role="listitem"
           [title]="'filters.clearBasket' | transloco"
           (click)="clearBasket()"
@@ -16171,7 +16173,7 @@ class SavedSearchDialog {
         this.dialog()?.showModal();
     }
     async confirm() {
-        this.savedSearchesService.saveSearch(this.saveName());
+        this.savedSearchesService.saveSearch(this.saveName(), this.queryParamsStore.tab?.());
         notify.success(this.transloco.translate("searches.saved.saved"), { duration: 2000 });
         // emit close output of the component
         this.dialog()?.close("dialog-confirm");