@fluid-topics/ft-search-saved-searches 1.3.16 → 1.3.18

package/build/ft-search-saved-searches.d.ts

@@ -1,7 +1,7 @@
 import { PropertyValues } from "lit";
 import { ElementDefinitionsMap } from "@fluid-topics/ft-wc-utils";
 import { FtSearchSavedSearchesProperties } from "./ft-search-saved-searches.properties";
-import { FtMetadataFilter, FtMySearch } from "@fluid-topics/public-api";
+import { FtMetadataFilter, FtMySearch, FtSearchSortOption } from "@fluid-topics/public-api";
 import { FtSearchComponent } from "@fluid-topics/ft-search-context/build/registration";
 declare const FtSearchSavedSearches_base: typeof FtSearchComponent & import("@fluid-topics/ft-wc-utils").Constructor<import("@fluid-topics/ft-i18n").FtLitElementWithI18nInterface>;
 export declare class FtSearchSavedSearches extends FtSearchSavedSearches_base implements FtSearchSavedSearchesProperties {
@@ -13,6 +13,7 @@ export declare class FtSearchSavedSearches extends FtSearchSavedSearches_base im
     savedSearches?: Array<FtMySearch>;
     private user?;
     private request?;
+    sortOptions?: FtSearchSortOption[];
     private requiredRole;
     static elementDefinitions: ElementDefinitionsMap;
     constructor();
@@ -26,7 +27,7 @@ export declare class FtSearchSavedSearches extends FtSearchSavedSearches_base im
     private renderValueFilter;
     private renderDateFilter;
     private renderRangeFilter;
-    private mapSortKey;
+    private mapSortId;
     private mapDateFilterType;
     private get userHasRights();
     private get isEmpty();

package/build/ft-search-saved-searches.js

@@ -21,6 +21,7 @@ import { FtIcon } from "@fluid-topics/ft-icon";
 import { FtCard } from "@fluid-topics/ft-card";
 import { FtChip } from "@fluid-topics/ft-chip";
 import { FtButton } from "@fluid-topics/ft-button";
+import { i18nAttributeConverter } from "@fluid-topics/ft-i18n/build/decorators/I18nAttributeConverter";
 class FtSearchSavedSearches extends withI18n(FtSearchComponent) {
     constructor() {
         super();
@@ -39,16 +40,16 @@ class FtSearchSavedSearches extends withI18n(FtSearchComponent) {
             var _a;
             return html `
                 <div part="container" role="group" aria-label="${savedSearches.messages.groupLabel()}">
-                    ${repeat((_a = this.savedSearches) !== null && _a !== void 0 ? _a : [], s => s.id, s => {
+                    ${repeat((_a = this.savedSearches) !== null && _a !== void 0 ? _a : [], (s) => s.id, (s) => {
                 const ftSearchRequest = this.toFtSearchRequest(s.searchRequest);
                 if (ftSearchRequest === undefined) {
                     return nothing;
                 }
                 return html `
                                 <a href="${searchPlaceConverter === null || searchPlaceConverter === void 0 ? void 0 : searchPlaceConverter.serialize(ftSearchRequest)}"
-                                   @click="${(e) => this.onLinkClick(e, ftSearchRequest)}"
+                                   @click=${(e) => this.onLinkClick(e, ftSearchRequest)}
                                    aria-current="${this.isSelected(s.searchRequest)}">
-                                    <ft-card clickable ?selected="${this.isSelected(s.searchRequest)}" part="card">
+                                    <ft-card clickable ?selected=${this.isSelected(s.searchRequest)} part="card">
                                         <div slot="header">
                                             <ft-typography variant="title">${s.title}</ft-typography>
                                             ${this.renderAlertStatus(s.alert)}
@@ -83,15 +84,15 @@ class FtSearchSavedSearches extends withI18n(FtSearchComponent) {
     // See net.antidot.fluidtopics.client.application.mylibrary.shared.MyLibraryTagWidgetFactory.createMySearchTags
     renderSearchFilters(searchRequest) {
         return when(this.showSearchFilters, () => {
-            var _a, _b, _c, _d, _e, _f, _g;
+            var _a, _b, _c, _d, _e;
             return html `
             <div part="search-filters" class="content">
                 ${when((_a = searchRequest.query.length) !== null && _a !== void 0 ? _a : 0 > 0, () => this.renderMetadata(savedSearches.messages.keywords(), searchRequest.query))}
                 ${when(searchRequest.virtualField == FtVirtualField.TITLE_ONLY, () => this.renderMetadata(savedSearches.messages.in(), savedSearches.messages.titles()))}
                 ${when(searchRequest.scope == FtSearchScope.DOCUMENTS, () => this.renderMetadata(savedSearches.messages.resultsType(), savedSearches.messages.documentsOnly()))}
-                ${(_c = (_b = searchRequest.metadataFilters) === null || _b === void 0 ? void 0 : _b.map(f => this.renderUnknownFilter(f))) !== null && _c !== void 0 ? _c : nothing}
+                ${(_c = (_b = searchRequest.metadataFilters) === null || _b === void 0 ? void 0 : _b.map((f) => this.renderUnknownFilter(f))) !== null && _c !== void 0 ? _c : nothing}
                 ${when((_e = (_d = searchRequest.contentLocale) === null || _d === void 0 ? void 0 : _d.length) !== null && _e !== void 0 ? _e : 0 > 0, () => this.renderMetadata(savedSearches.messages.language(), searchRequest.contentLocale))}
-                ${when((_g = (_f = searchRequest.sort[0]) === null || _f === void 0 ? void 0 : _f.key.length) !== null && _g !== void 0 ? _g : 0 > 0, () => this.renderMetadata(savedSearches.messages.sort(), this.mapSortKey(searchRequest.sort[0].key)))}
+                ${when(searchRequest.sortId != undefined, () => this.renderMetadata(savedSearches.messages.sort(), this.mapSortId(searchRequest.sortId)))}
             </div>`;
         });
     }
@@ -123,15 +124,15 @@ class FtSearchSavedSearches extends withI18n(FtSearchComponent) {
     renderRangeFilter() {
         return this.renderMetadata(savedSearches.messages.period(), savedSearches.messages.customPeriod());
     }
-    mapSortKey(key) {
-        switch (key) {
-            case "afs:relevance":
-                return savedSearches.messages.relevance();
-            case "ft:lastEdition":
-                return savedSearches.messages.lastUpdate();
-            default:
-                return key;
+    mapSortId(sortId) {
+        if (this.sortOptions == undefined) {
+            return undefined;
+        }
+        let sortOption = this.sortOptions.find((option) => option.id == sortId);
+        if (sortOption == undefined) {
+            sortOption = this.sortOptions.find((option) => option.id == "relevance");
         }
+        return this.i18n(i18nAttributeConverter.fromLocalizableLabel(sortOption.label));
     }
     mapDateFilterType(dateFilterType) {
         switch (dateFilterType) {
@@ -157,20 +158,20 @@ class FtSearchSavedSearches extends withI18n(FtSearchComponent) {
         return this.request != undefined
             && deepEqual(this.request.query, mySearchRequest.query)
             && this.areFtMetadataFiltersEqual([...this.request.metadataFilters], [...(_a = mySearchRequest.metadataFilters) !== null && _a !== void 0 ? _a : []].map(this.toMetadataFilter))
-            && deepEqual([...this.request.sort].map(this.mapFtSearchSortCriterion), [...mySearchRequest.sort].map(this.mapFtSearchSortCriterion))
+            && deepEqual(this.request.sortId, mySearchRequest.sortId)
             && deepEqual(this.request.contentLocale, mySearchRequest.contentLocale)
             && deepEqual((_b = this.request.virtualField) !== null && _b !== void 0 ? _b : "EVERYWHERE", (_c = mySearchRequest.virtualField) !== null && _c !== void 0 ? _c : "EVERYWHERE")
             && deepEqual((_d = this.request.scope) !== null && _d !== void 0 ? _d : "DEFAULT", (_e = mySearchRequest.scope) !== null && _e !== void 0 ? _e : "DEFAULT");
     }
     areFtMetadataFiltersEqual(arr1, arr2) {
-        if (!deepEqual(arr1.map(i => i.key).sort(), arr2.map(i => i.key).sort())) {
+        if (!deepEqual(arr1.map((i) => i.key).sort(), arr2.map((i) => i.key).sort())) {
             return false;
         }
         const compareObjects = (obj1, obj2) => {
             return obj1.key === obj2.key && this.compareUnknownFilter(obj1, obj2);
         };
         for (const obj1 of arr1) {
-            const matchingObject = arr2.find(obj2 => compareObjects(obj1, obj2));
+            const matchingObject = arr2.find((obj2) => compareObjects(obj1, obj2));
             if (!matchingObject) {
                 return false;
             }
@@ -192,7 +193,7 @@ class FtSearchSavedSearches extends withI18n(FtSearchComponent) {
     compareValueFilter(obj1, obj2) {
         return obj1.negative === obj2.negative
             && obj1.values.length === obj2.values.length
-            && obj1.values.every(value => obj2.values.includes(value));
+            && obj1.values.every((value) => obj2.values.includes(value));
     }
     compareDateFilter(obj1, obj2) {
         return obj1.type === obj2.type;
@@ -210,10 +211,10 @@ class FtSearchSavedSearches extends withI18n(FtSearchComponent) {
             ...this.request,
             query: mySearchRequest.query,
             metadataFilters: (_b = (_a = mySearchRequest.metadataFilters) === null || _a === void 0 ? void 0 : _a.map(this.toMetadataFilter)) !== null && _b !== void 0 ? _b : [],
-            sort: mySearchRequest.sort,
+            sortId: mySearchRequest.sortId,
             contentLocale: mySearchRequest.contentLocale,
             virtualField: mySearchRequest.virtualField,
-            scope: mySearchRequest.scope
+            scope: mySearchRequest.scope,
         };
     }
     toMetadataFilter(f) {
@@ -221,7 +222,7 @@ class FtSearchSavedSearches extends withI18n(FtSearchComponent) {
             key: f.key,
             valueFilter: f.valueFilter,
             dateFilter: f.dateFilter,
-            rangeFilter: f.rangeFilter
+            rangeFilter: f.rangeFilter,
         };
     }
     connectedCallback() {
@@ -251,7 +252,7 @@ FtSearchSavedSearches.elementDefinitions = {
     "ft-icon": FtIcon,
     "ft-card": FtCard,
     "ft-chip": FtChip,
-    "ft-button": FtButton
+    "ft-button": FtButton,
 };
 __decorate([
     property({ type: Boolean })
@@ -274,4 +275,7 @@ __decorate([
 __decorate([
     redux({ store: "search" })
 ], FtSearchSavedSearches.prototype, "request", void 0);
+__decorate([
+    redux({ store: "search", selector: (state) => { var _a; return (_a = state.configuration) === null || _a === void 0 ? void 0 : _a.sortOptions; } })
+], FtSearchSavedSearches.prototype, "sortOptions", void 0);
 export { FtSearchSavedSearches };