@fluid-topics/ft-wc-utils 1.2.45 → 1.2.48

package/build/SearchPlaceConverter.d.ts

@@ -28,9 +28,9 @@ export declare class SearchPlaceConverter {
     constructor(baseUrl: string, predefinedSorts?: Record<string, Array<FtSearchSortCriterion>>, defaultPerPage?: number, allLanguagesAllowed?: boolean, defaultContentLocale?: string);
     serialize(request: EnrichedFtSearchRequest, searchPage?: string): string;
     serializeToCurrentPageIfPossible(request: EnrichedFtSearchRequest, searchPage?: string): string;
-    toURLSearchParams(request: EnrichedFtSearchRequest, omitContentLocaleIfDefault?: boolean): URLSearchParams;
+    toURLSearchParams(request: EnrichedFtSearchRequest, omitContentLocaleIfDefault?: boolean): string;
     parse(url: string): EnrichedFtSearchRequest;
-    fromURLSearchParams(params: URLSearchParams): EnrichedFtSearchRequest;
+    fromURLSearchParams(strParams: string): EnrichedFtSearchRequest;
     private parseCompatFilters;
     private splitUnknownFilter;
     private parseValueFilters;

package/build/SearchPlaceConverter.js

@@ -52,10 +52,9 @@ export class SearchPlaceConverter {
         return this.serializeToCurrentPageIfPossible(request, searchPage !== null && searchPage !== void 0 ? searchPage : "/search");
     }
     serializeToCurrentPageIfPossible(request, searchPage) {
-        const queryParams = this.toURLSearchParams(request).toString();
         const useCurrenLocation = searchPage == null || searchPage.trim().length === 0;
         const url = new URL(useCurrenLocation ? window.location.href : `${this.baseUrl.replace(/\/+$/, "")}${searchPage}`);
-        url.search = queryParams;
+        url.search = this.toURLSearchParams(request);
         return url.toString();
     }
     toURLSearchParams(request, omitContentLocaleIfDefault = false) {
@@ -70,12 +69,7 @@ export class SearchPlaceConverter {
             params.append(SearchPlaceQueryParams.LOCALE, this.allLanguagesAllowed ? "all" : this.defaultContentLocale);
         }
         if (((_a = request.query) === null || _a === void 0 ? void 0 : _a.length) > 0) {
-            // Explicitly encode query. This leads to the serialized query to be encoded twice (e.g. "one two" is
-            // encoded into "one%2520two" rather than "one+two" or "one%20two").
-            // This is necessary as it is decoded twice when loading the search page. Encoding only once causes
-            // errors if the query contains a '%' character, as the second decoding treats it as the start of an
-            // encoded character.
-            params.append(SearchPlaceQueryParams.QUERY, encodeURIComponent(request.query));
+            params.append(SearchPlaceQueryParams.QUERY, request.query);
         }
         if (request.scope && request.scope !== "DEFAULT") {
             params.append(SearchPlaceQueryParams.SCOPE, request.scope.toLowerCase());
@@ -92,7 +86,7 @@ export class SearchPlaceConverter {
                 var _a, _b;
                 const values = ((_b = (_a = f.valueFilter) === null || _a === void 0 ? void 0 : _a.values) !== null && _b !== void 0 ? _b : [])
                     .map(value => this.escapeFilters(value))
-                    .map(value => encodeURIComponent(quote(unquote(value))))
+                    .map(value => quote(unquote(value)))
                     .join("_");
                 return `${f.key}~${values}`;
             }).join("*");
@@ -117,17 +111,25 @@ export class SearchPlaceConverter {
         if (((_k = request.paging) === null || _k === void 0 ? void 0 : _k.perPage) && ((_m = (_l = request.paging) === null || _l === void 0 ? void 0 : _l.perPage) !== null && _m !== void 0 ? _m : this.defaultPerPage) != this.defaultPerPage) {
             params.append(SearchPlaceQueryParams.PER_PAGE, String(request.paging.perPage));
         }
-        return params;
+        // GWT needs the query string to be encoded twice 🙄
+        return encodeURI(params.toString()).replace(/#/g, "%23");
     }
     parse(url) {
         var _a;
         const urlSplit = url.split("?");
-        const fromParams = this.fromURLSearchParams(new URLSearchParams(urlSplit.slice(1).join("?")));
+        const fromParams = this.fromURLSearchParams(urlSplit.slice(1).join("?"));
         const maybeScopeFromPath = urlSplit[0].split("/search/")[1];
         return maybeScopeFromPath == null ? fromParams : { ...fromParams, scope: (_a = this.scopeMapping[maybeScopeFromPath]) !== null && _a !== void 0 ? _a : fromParams.scope };
     }
-    fromURLSearchParams(params) {
+    fromURLSearchParams(strParams) {
         var _a, _b, _c, _d, _e, _f, _g, _h;
+        try {
+            strParams = decodeURI(strParams).replace(/%23/g, "#");
+        }
+        catch (e) {
+            console.warn("Could not decode search request query params, fallback on raw value", e);
+        }
+        const params = new URLSearchParams(strParams);
         const contentLocale = params.get(SearchPlaceQueryParams.LOCALE) === "all" ? undefined : params.get(SearchPlaceQueryParams.LOCALE);
         const virtualField = ((_a = params.get(SearchPlaceQueryParams.VIRTUAL_FIELD)) !== null && _a !== void 0 ? _a : "EVERYWHERE").toUpperCase();
         const sortType = ((_b = params.get(SearchPlaceQueryParams.SORT)) !== null && _b !== void 0 ? _b : "DEFAULT").toUpperCase();
@@ -141,7 +143,7 @@ export class SearchPlaceConverter {
         }
         return {
             contentLocale: contentLocale !== null && contentLocale !== void 0 ? contentLocale : (this.allLanguagesAllowed ? undefined : this.defaultContentLocale),
-            query: decodeURIComponent((_e = params.get(SearchPlaceQueryParams.QUERY)) !== null && _e !== void 0 ? _e : ""),
+            query: (_e = params.get(SearchPlaceQueryParams.QUERY)) !== null && _e !== void 0 ? _e : "",
             scope: (_f = this.scopeMapping[scope]) !== null && _f !== void 0 ? _f : "DEFAULT",
             virtualField: isFtVirtualField(virtualField) ? virtualField : "EVERYWHERE",
             sort: (_h = (_g = this.predefinedSorts[sortType]) !== null && _g !== void 0 ? _g : this.predefinedSorts["DEFAULT"]) !== null && _h !== void 0 ? _h : [],
@@ -174,7 +176,7 @@ export class SearchPlaceConverter {
         ];
     }
     splitUnknownFilter(s) {
-        return this.superEscapeFilters(decodeURIComponent(s))
+        return this.superEscapeFilters(s)
             .split("*")
             .map(oneFilter => oneFilter.split("~"));
     }