@fluid-topics/ft-search-saved-searches 1.2.56 → 1.2.58

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

@@ -1,4 +1,4 @@
-import { nothing, PropertyValues } from "lit";
+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";
@@ -16,7 +16,7 @@ export declare class FtSearchSavedSearches extends FtSearchSavedSearches_base im
     private requiredRole;
     static elementDefinitions: ElementDefinitionsMap;
     constructor();
-    render(): typeof nothing | import("lit-html").TemplateResult<1>;
+    render(): import("lit-html").TemplateResult<1> | undefined;
     private renderDescription;
     private renderSearchButton;
     private renderAlertStatus;

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

@@ -6,6 +6,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 };
 import { html, nothing } from "lit";
 import { property } from "lit/decorators.js";
+import { when } from "lit/directives/when.js";
 import { deepEqual, redux } from "@fluid-topics/ft-wc-utils";
 import { styles } from "./ft-search-saved-searches.styles";
 import { ftAppInfoStore, SearchPlaceConverterProvider } from "@fluid-topics/ft-app-context";
@@ -33,11 +34,11 @@ class FtSearchSavedSearches extends withI18n(FtSearchComponent) {
         this.addI18nContext(savedSearches, defaultSavedSearchesMessages);
     }
     render() {
-        var _a;
         const searchPlaceConverter = SearchPlaceConverterProvider.get();
-        if (this.userHasRights && !this.isEmpty) {
+        return when(this.userHasRights && !this.isEmpty, () => {
+            var _a;
             return html `
-                <div part="container">
+                <div part="container" role="group" aria-label="${savedSearches.messages.groupLabel()}">
                     ${repeat((_a = this.savedSearches) !== null && _a !== void 0 ? _a : [], s => s.id, s => {
                 const ftSearchRequest = this.toFtSearchRequest(s.searchRequest);
                 if (ftSearchRequest === undefined) {
@@ -62,53 +63,36 @@ class FtSearchSavedSearches extends withI18n(FtSearchComponent) {
             })}
                 </div>
             `;
-        }
-        else {
-            return nothing;
-        }
+        });
     }
     renderDescription(description) {
-        return this.showDescription && description
-            ? html `
-                <div part="description" class="content">${description}</div>`
-            : nothing;
+        return when(this.showDescription && description, () => html `
+            <div part="description" class="content">${description}</div>`);
     }
     renderSearchButton(isSelected) {
-        return this.showSearchButton
-            ? html `
-                <div part="search-button">
-                    <ft-button id="search" icon="search" ?disabled=${isSelected}>${savedSearches.messages.search()}</ft-button>
-                </div>`
-            : nothing;
+        return when(this.showSearchButton, () => html `
+            <div part="search-button">
+                <ft-button id="search" tabindex="-1" icon="search" ?disabled=${isSelected}>${savedSearches.messages.search()}</ft-button>
+            </div>`);
     }
     renderAlertStatus(alert) {
-        return this.showAlertStatus && alert
-            ? html `
-                <ft-icon part="alert-status">alert</ft-icon>`
-            : nothing;
+        return when(this.showAlertStatus && alert, () => html `
+            <ft-icon part="alert-status">alert</ft-icon>`);
     }
     // See net.antidot.fluidtopics.client.application.mylibrary.shared.MyLibraryTagWidgetFactory.createMySearchTags
     renderSearchFilters(searchRequest) {
-        var _a, _b, _c, _d, _e, _f, _g;
-        return this.showSearchFilters ? html `
+        return when(this.showSearchFilters, () => {
+            var _a, _b, _c, _d, _e, _f, _g;
+            return html `
             <div part="search-filters" class="content">
-                ${((_a = searchRequest.query.length) !== null && _a !== void 0 ? _a : 0 > 0)
-            ? this.renderMetadata(savedSearches.messages.keywords(), searchRequest.query)
-            : nothing}
-                ${searchRequest.virtualField == FtVirtualField.TITLE_ONLY
-            ? this.renderMetadata(savedSearches.messages.in(), savedSearches.messages.titles())
-            : nothing}
-                ${searchRequest.scope == FtSearchScope.DOCUMENTS
-            ? this.renderMetadata(savedSearches.messages.resultsType(), savedSearches.messages.documentsOnly())
-            : nothing}
+                ${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}
-                ${((_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)
-            : nothing}
-                ${((_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))
-            : nothing}
-            </div>` : 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)))}
+            </div>`;
+        });
     }
     renderMetadata(key, values) {
         return html `