Changes for page Context Search

Summary

• Page properties (1 modified, 0 added, 0 removed)

Details

Page properties

Content

...	...	@@ -61,15 +61,16 @@
61	61	handleSearch(textSearch) {
62	62	if(this.searchText !== "" || textSearch) {
63	63	if(this.searchText !== this.prevSearchText) {
	64	+ this.clearResults();
64	64	this.prevSearchText = this.searchText;
65		- Promise.all([
66		- this.fetchWikiSearch(),
67		- this.fetchFilterSearch()
68		- ]).then(([wikiSearchResults, collabSearchResults]) => {
69		- this.results = wikiSearchResults;
70		- this.resultsCache = wikiSearchResults;
71		- console.log(wikiSearchResults, collabSearchResults);
72		- });
	66	+ this.fetchWikiSearch().then(results => {
	67	+ this.resultsCache = results;
	68	+ if(this.hasActiveFilters()) {
	69	+ this.fetchFilterSearch().then(this.filterResults);
	70	+ } else {
	71	+ this.results = results;
	72	+ }
	73	+ })
73	73	} else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) {
74	74	this.fetchFilterSearch().then(this.filterResults)
75	75	} else {
...	...	@@ -116,7 +116,7 @@
116	116	<div>
117	117	<div>
118	118	<input @change="${this.setSearchText}" type="text" placeholder="Search..." />
119		- <button @click="${this.handleSearch}">Search</button>
	120	+ <button @click="${() => this.handleSearch(true)}">Search</button>
120	120	</div>
121	121	<div>
122	122	<label><input type="checkbox" @change="${() => this.toggleRoleFilter('administrator')}" .checked="${this.administratorFilter}"/> Administrator</label>