IAM21 instance, do not create collab nor modify a team, your changes will be lost


Changes for page Context Search

Last modified by bougault on 2023/02/20 16:29
From version 27.50
edited by bougault
on 2022/11/17 14:17
Change comment: There is no comment for this version
To version 27.72
edited by bougault
on 2022/11/17 14:52
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -1,6 +1,7 @@
1 1  {{html clean="false"}}
2 2  <!--
3 - !!! POC. Code must be reviewed / optimized and packaged for use in production !!!
3 + !!! POC. Code must be reviewed / optimized and packaged for use in production !!!
4 + !!! Many optimisations can be done !!!
4 4  -->
5 5  <script type="module">
6 6  import {LitElement, html, css} from 'https://cdn.jsdelivr.net/gh/lit/dist@2/core/lit-core.min.js';
... ... @@ -7,21 +7,15 @@
7 7  window.addEventListener('DOMContentLoaded', function() {
8 8  
9 9   class UnifiedSearch extends LitElement {
10 - /*
11 11   static properties = {
12 - searchText: { type: String },
13 - favoritesFilter: { type: Boolean },
14 - administratorFilter: { type: Boolean },
15 - editorFilter: { type: Boolean },
16 - viewerFilter: { type: Boolean },
17 - publicFilter: { type: Boolean },
18 - privateFilter: { type: Boolean },
12 + results: { type: Array },
13 + resultsCache: { type: Array },
14 + collabFiltersResults: { type: Array}
19 19   }
20 - */
21 - static properties = {
22 - results: { type: Array }
23 - }
24 24   static styles = css`
17 + :host > div {
18 + padding-bottom: 4em;
19 + }
25 25   .result {
26 26   margin-top: 1em;
27 27   }
... ... @@ -45,6 +45,9 @@
45 45   this.results = [];
46 46   this.resultsCache = [];
47 47   }
43 + firstUpdated() {
44 + this.renderRoot.getElementById('searchInput').focus();
45 + }
48 48   toggleRoleFilter(roleName) {
49 49   if(this.rolesFilter.indexOf(roleName) === -1) {
50 50   this.rolesFilter.push(roleName);
... ... @@ -61,23 +61,16 @@
61 61   handleSearch(textSearch) {
62 62   if(this.searchText !== "" || textSearch) {
63 63   if(this.searchText !== this.prevSearchText) {
62 + this.clearResults();
64 64   this.prevSearchText = this.searchText;
65 65   this.fetchWikiSearch().then(results => {
66 - console.log(results);
67 - //this.results = results;
68 68   this.resultsCache = results;
69 - this.fetchFilterSearch().then(this.filterResults);
66 + if(this.hasActiveFilters()) {
67 + this.fetchFilterSearch().then(this.filterResults);
68 + } else {
69 + this.results = results;
70 + }
70 70   })
71 - /*
72 - Promise.all([
73 - this.fetchWikiSearch(),
74 - this.fetchFilterSearch()
75 - ]).then(([wikiSearchResults, collabSearchResults]) => {
76 - this.results = wikiSearchResults;
77 - this.resultsCache = wikiSearchResults;
78 - console.log(wikiSearchResults, collabSearchResults);
79 - });
80 - */
81 81   } else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) {
82 82   this.fetchFilterSearch().then(this.filterResults)
83 83   } else {
... ... @@ -102,7 +102,10 @@
102 102   fetchFilterSearch() {
103 103   return new Promise((resolve) => {
104 104   if(this.hasActiveFilters()) {
105 - fetch(this.filterUrl).then(res => res.json()).then(resolve);
96 + fetch(this.filterUrl).then(res => res.json()).then((res) => {
97 + this.collabFiltersResults = res;
98 + resolve(res);
99 + });
106 106   } else {
107 107   resolve([]);
108 108   }
... ... @@ -119,11 +119,16 @@
119 119   getLink(xwikiDocSpace) {
120 120   return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`;
121 121   }
116 + handleKeyPress(e) {
117 + if (e.keyCode === 13) {
118 + this.handleSearch(true);
119 + }
120 + }
122 122   render() {
123 123   return html`
124 124  <div>
125 125   <div>
126 - <input @change="${this.setSearchText}" type="text" placeholder="Search..." />
125 + <input id="searchInput" @change="${this.setSearchText}" type="text" placeholder="Search..." @keypress="${this.handleKeyPress}" />
127 127   <button @click="${() => this.handleSearch(true)}">Search</button>
128 128   </div>
129 129   <div>
... ... @@ -140,6 +140,16 @@
140 140   </div>
141 141   `)}
142 142   </div>
142 + <div class="rawResults">
143 + <div>
144 + <strong>XWiki Search Results</strong>
145 + <pre>${JSON.stringify(this.resultsCache, null, 2)}</pre>
146 + </div>
147 + <div>
148 + <strong>Collab Search Results (Filters)</strong>
149 + <pre>${JSON.stringify(this.collabFiltersResults, null, 2)}</pre>
150 + </div>
151 + </div>
143 143  </div>
144 144  `
145 145   }
... ... @@ -167,7 +167,5 @@
167 167   }
168 168  });
169 169  </script>
170 -
171 171  <clb-unified-search></clb-unified-search>
172 -
173 173  {{/html}}