extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 23:00:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix no results sometimes showed even if there were results

Browse Source
This commit is contained in:
nathan 2023-09-15 08:09:12 -06:00
parent d27f8083a0
commit 19552059b3
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
api/js/etemplate/Et2Select/SearchMixin.ts
View File

@ -7,7 +7,7 @@
* @author Nathan Gray * @author Nathan Gray
*/ */
import {css, CSSResultGroup, html, LitElement, nothing, render, TemplateResult} from "lit"; import {css, CSSResultGroup, html, LitElement, nothing, TemplateResult} from "lit";
import {cleanSelectOptions, SelectOption} from "./FindSelectOptions"; import {cleanSelectOptions, SelectOption} from "./FindSelectOptions";
import {Validator} from "@lion/form-core"; import {Validator} from "@lion/form-core";
import {Et2Tag} from "./Tag/Et2Tag"; import {Et2Tag} from "./Tag/Et2Tag";
@ -419,6 +419,7 @@ export const Et2WithSearchMixin = dedupeMixin(<T extends Constructor<LitElement>
return html` return html`
${this._searchInputTemplate()} ${this._searchInputTemplate()}
${this._moreResultsTemplate()} ${this._moreResultsTemplate()}
${this._noResultsTemplate()}
`; `;
} }
@ -463,6 +464,11 @@ export const Et2WithSearchMixin = dedupeMixin(<T extends Constructor<LitElement>
protected _noResultsTemplate() protected _noResultsTemplate()
{ {
if(this._total_result_count !== 0)
{
return nothing;
}
return html` return html`
<div class="no-results">${this.egw().lang("no suggestions")}</div>`; <div class="no-results">${this.egw().lang("no suggestions")}</div>`;
} }
@ -1037,15 +1043,6 @@ export const Et2WithSearchMixin = dedupeMixin(<T extends Constructor<LitElement>
this.remoteSearch(this._searchInputNode.value, this.searchOptions) this.remoteSearch(this._searchInputNode.value, this.searchOptions)
]).then(() => ]).then(() =>
{ {
// Show no results indicator
if(this.getAllOptions().filter(e => !e.classList.contains("no-match")).length == 0)
{
let target = this._optionTargetNode || this;
let temp = document.createElement("div");
render(this._noResultsTemplate(), temp);
target.append(temp.children[0]);
}
// Remove spinner // Remove spinner
spinner.remove(); spinner.remove();