@fluid-topics/ft-wc-utils 1.3.15 → 1.3.17

package/build/SearchPlaceConverter.d.ts

@@ -1,4 +1,4 @@
-import { FtSearchRequest, FtSearchSortCriterion } from "@fluid-topics/public-api";
+import { FtSearchRequest } from "@fluid-topics/public-api";
 export interface EnrichedFtSearchRequest extends FtSearchRequest {
     otherQueryParams?: Record<string, string>;
 }
@@ -20,12 +20,11 @@ export declare enum SearchPlaceQueryParams {
 export declare function isSearchPlaceQueryParams(param: string): param is SearchPlaceQueryParams;
 export declare class SearchPlaceConverter {
     private readonly baseUrl;
-    private readonly predefinedSorts;
     private readonly defaultPerPage;
     private readonly allLanguagesAllowed;
     private readonly defaultContentLocale;
     private readonly scopeMapping;
-    constructor(baseUrl: string, predefinedSorts?: Record<string, Array<FtSearchSortCriterion>>, defaultPerPage?: number, allLanguagesAllowed?: boolean, defaultContentLocale?: string);
+    constructor(baseUrl: string, defaultPerPage?: number, allLanguagesAllowed?: boolean, defaultContentLocale?: string);
     serialize(request: EnrichedFtSearchRequest, searchPage?: string): string;
     serializeToCurrentPageIfPossible(request: EnrichedFtSearchRequest, searchPage?: string): string;
     toURLSearchParams(request: EnrichedFtSearchRequest, omitContentLocaleIfDefault?: boolean): string;

package/build/SearchPlaceConverter.js

@@ -32,15 +32,14 @@ export function isSearchPlaceQueryParams(param) {
     return SearchPlaceQueryParamsValues.has(param);
 }
 export class SearchPlaceConverter {
-    constructor(baseUrl, predefinedSorts = {}, defaultPerPage = 20, allLanguagesAllowed = false, defaultContentLocale = "en-US") {
+    constructor(baseUrl, defaultPerPage = 20, allLanguagesAllowed = false, defaultContentLocale = "en-US") {
         this.baseUrl = baseUrl;
-        this.predefinedSorts = predefinedSorts;
         this.defaultPerPage = defaultPerPage;
         this.allLanguagesAllowed = allLanguagesAllowed;
         this.defaultContentLocale = defaultContentLocale;
         this.scopeMapping = {
-            "documents": "DOCUMENTS",
-            "topics": "ALL_TOPICS",
+            documents: "DOCUMENTS",
+            topics: "ALL_TOPICS",
         };
         this.filtersEscapeMapping = [
             ["*", "\\*", "[ft-escaped-star-character]"],
@@ -58,7 +57,7 @@ export class SearchPlaceConverter {
         return url.toString();
     }
     toURLSearchParams(request, omitContentLocaleIfDefault = false) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
         const params = new URLSearchParams();
         if (request.contentLocale) {
             if (!omitContentLocaleIfDefault || request.contentLocale !== this.defaultContentLocale) {
@@ -72,27 +71,27 @@ export class SearchPlaceConverter {
             params.append(SearchPlaceQueryParams.QUERY, request.query);
         }
         // Only extract non-negative valueFilter since they are not supported by URLSearchParams
-        const valueFilters = (_c = (_b = request.metadataFilters) === null || _b === void 0 ? void 0 : _b.filter(f => f.valueFilter && !f.valueFilter.negative)) !== null && _c !== void 0 ? _c : [];
+        const valueFilters = (_c = (_b = request.metadataFilters) === null || _b === void 0 ? void 0 : _b.filter((f) => f.valueFilter && !f.valueFilter.negative)) !== null && _c !== void 0 ? _c : [];
         if (valueFilters.length > 0) {
-            const serializedValues = valueFilters.map(f => {
+            const serializedValues = valueFilters.map((f) => {
                 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 => quote(unquote(value)))
+                    .map((value) => this.escapeFilters(value))
+                    .map((value) => quote(unquote(value)))
                     .join("_");
                 return `${f.key}~${values}`;
             }).join("*");
             params.append(SearchPlaceQueryParams.VALUE_FILTERS, serializedValues);
         }
-        const dateFilters = (_e = (_d = request.metadataFilters) === null || _d === void 0 ? void 0 : _d.filter(f => f.dateFilter)) !== null && _e !== void 0 ? _e : [];
+        const dateFilters = (_e = (_d = request.metadataFilters) === null || _d === void 0 ? void 0 : _d.filter((f) => f.dateFilter)) !== null && _e !== void 0 ? _e : [];
         if (dateFilters.length > 0) {
-            const serializedDates = dateFilters.map(f => { var _a; return `${f.key}~${(_a = f.dateFilter) === null || _a === void 0 ? void 0 : _a.type.toLowerCase()}`; })
+            const serializedDates = dateFilters.map((f) => { var _a; return `${f.key}~${(_a = f.dateFilter) === null || _a === void 0 ? void 0 : _a.type.toLowerCase()}`; })
                 .join("*");
             params.append(SearchPlaceQueryParams.DATE_FILTERS, serializedDates);
         }
-        const rangeFilters = (_g = (_f = request.metadataFilters) === null || _f === void 0 ? void 0 : _f.filter(f => f.rangeFilter)) !== null && _g !== void 0 ? _g : [];
+        const rangeFilters = (_g = (_f = request.metadataFilters) === null || _f === void 0 ? void 0 : _f.filter((f) => f.rangeFilter)) !== null && _g !== void 0 ? _g : [];
         if (rangeFilters.length > 0) {
-            const serializedRanges = rangeFilters.map(f => { var _a, _b; return `${f.key}~${(_a = f.rangeFilter) === null || _a === void 0 ? void 0 : _a.from}_${(_b = f.rangeFilter) === null || _b === void 0 ? void 0 : _b.to}`; })
+            const serializedRanges = rangeFilters.map((f) => { var _a, _b; return `${f.key}~${(_a = f.rangeFilter) === null || _a === void 0 ? void 0 : _a.from}_${(_b = f.rangeFilter) === null || _b === void 0 ? void 0 : _b.to}`; })
                 .join("*");
             params.append(SearchPlaceQueryParams.RANGE_FILTERS, serializedRanges);
         }
@@ -102,13 +101,13 @@ export class SearchPlaceConverter {
         if (request.scope && request.scope !== "DEFAULT") {
             params.append(SearchPlaceQueryParams.SCOPE, request.scope.toLowerCase());
         }
-        if (((_h = request.sort) === null || _h === void 0 ? void 0 : _h.length) > 0 && request.sort[0].key === "ft:lastEdition") {
-            params.append(SearchPlaceQueryParams.SORT, "last_update");
+        if (request.sortId != undefined) {
+            params.append(SearchPlaceQueryParams.SORT, request.sortId);
         }
-        if (((_j = request.paging) === null || _j === void 0 ? void 0 : _j.perPage) && ((_l = (_k = request.paging) === null || _k === void 0 ? void 0 : _k.perPage) !== null && _l !== void 0 ? _l : this.defaultPerPage) != this.defaultPerPage) {
+        if (((_h = request.paging) === null || _h === void 0 ? void 0 : _h.perPage) && ((_k = (_j = request.paging) === null || _j === void 0 ? void 0 : _j.perPage) !== null && _k !== void 0 ? _k : this.defaultPerPage) != this.defaultPerPage) {
             params.append(SearchPlaceQueryParams.PER_PAGE, String(request.paging.perPage));
         }
-        const otherQueryParams = (_m = request.otherQueryParams) !== null && _m !== void 0 ? _m : {};
+        const otherQueryParams = (_l = request.otherQueryParams) !== null && _l !== void 0 ? _l : {};
         for (const key in otherQueryParams) {
             params.append(key, otherQueryParams[key]);
         }
@@ -134,7 +133,7 @@ export class SearchPlaceConverter {
         return maybeScopeFromPath == null ? fromParams : { ...fromParams, scope: (_a = this.scopeMapping[maybeScopeFromPath]) !== null && _a !== void 0 ? _a : fromParams.scope };
     }
     fromURLSearchParams(strParams) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
+        var _a, _b, _c, _d, _e, _f;
         try {
             strParams = decodeURI(strParams).replace(/%23/g, "#");
         }
@@ -144,7 +143,7 @@ export class SearchPlaceConverter {
         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();
+        const sortId = (_b = params.get(SearchPlaceQueryParams.SORT)) === null || _b === void 0 ? void 0 : _b.toLowerCase();
         const scope = (_c = params.get(SearchPlaceQueryParams.SCOPE)) !== null && _c !== void 0 ? _c : "default";
         const perPage = +((_d = params.get(SearchPlaceQueryParams.PER_PAGE)) !== null && _d !== void 0 ? _d : this.defaultPerPage);
         const otherQueryParams = {};
@@ -158,7 +157,7 @@ export class SearchPlaceConverter {
             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 : [],
+            sortId: sortId,
             metadataFilters: this.parseCompatFilters(params),
             facets: [],
             paging: {
@@ -190,19 +189,19 @@ export class SearchPlaceConverter {
     splitUnknownFilter(s) {
         return this.superEscapeFilters(s)
             .split("*")
-            .map(oneFilter => oneFilter.split("~"));
+            .map((oneFilter) => oneFilter.split("~"));
     }
     parseValueFilters(s) {
         if (s.length === 0) {
             return [];
         }
         return this.splitUnknownFilter(s)
-            .map(oneFilterSplit => ({
+            .map((oneFilterSplit) => ({
             key: oneFilterSplit[0],
             valueFilter: {
                 values: oneFilterSplit[1].split("_")
                     .map(unquote)
-                    .map(value => this.unescapeFilterValue(value)),
+                    .map((value) => this.unescapeFilterValue(value)),
                 negative: false,
             },
         }));
@@ -212,7 +211,7 @@ export class SearchPlaceConverter {
             return [];
         }
         return this.splitUnknownFilter(s)
-            .map(oneFilterSplit => ({
+            .map((oneFilterSplit) => ({
             key: oneFilterSplit[0],
             dateFilter: {
                 type: FtDateFilterType[oneFilterSplit[1].toUpperCase()],
@@ -224,7 +223,7 @@ export class SearchPlaceConverter {
             return [];
         }
         return this.splitUnknownFilter(s)
-            .map(oneFilterSplit => ({
+            .map((oneFilterSplit) => ({
             key: oneFilterSplit[0],
             rangeFilter: {
                 from: oneFilterSplit[1].split("_")[0],

package/build/designSystemVariables.js

@@ -54,10 +54,10 @@ export const designSystemVariables = {
     elevation12: FtCssVariableFactory.create("--ft-elevation-12", "", "UNKNOWN", "0px 22px 40px 0px rgba(0, 0, 0, 0.06), 0px 12px 23px 0px rgba(0, 0, 0, 0.14), 0px 10px 11px 0px rgba(0, 0, 0, 0.06)"),
     elevation16: FtCssVariableFactory.create("--ft-elevation-16", "", "UNKNOWN", "0px 28px 52px 0px rgba(0, 0, 0, 0.06), 0px 16px 29px 0px rgba(0, 0, 0, 0.14), 0px 14px 15px 0px rgba(0, 0, 0, 0.06)"),
     elevation24: FtCssVariableFactory.create("--ft-elevation-24", "", "UNKNOWN", "0px 40px 76px 0px rgba(0, 0, 0, 0.06), 0px 24px 41px 0px rgba(0, 0, 0, 0.14), 0px 22px 23px 0px rgba(0, 0, 0, 0.06)"),
-    borderRadiusS: FtCssVariableFactory.create("--ft-border-radius-S", "", "SIZE", "4px"),
-    borderRadiusM: FtCssVariableFactory.create("--ft-border-radius-M", "", "SIZE", "8px"),
-    borderRadiusL: FtCssVariableFactory.create("--ft-border-radius-L", "", "SIZE", "12px"),
-    borderRadiusXL: FtCssVariableFactory.create("--ft-border-radius-XL", "", "SIZE", "16px"),
+    borderRadiusS: FtCssVariableFactory.create("--ft-border-radius-s", "", "SIZE", "4px"),
+    borderRadiusM: FtCssVariableFactory.create("--ft-border-radius-m", "", "SIZE", "8px"),
+    borderRadiusL: FtCssVariableFactory.create("--ft-border-radius-l", "", "SIZE", "12px"),
+    borderRadiusXL: FtCssVariableFactory.create("--ft-border-radius-xl", "", "SIZE", "16px"),
     titleFont: FtCssVariableFactory.create("--ft-title-font", "", "UNKNOWN", "Ubuntu, system-ui, sans-serif"),
     contentFont: FtCssVariableFactory.create("--ft-content-font", "", "UNKNOWN", "'Open Sans', system-ui, sans-serif"),
     transitionDuration: FtCssVariableFactory.create("--ft-transition-duration", "", "UNKNOWN", "250ms"),