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 31.6
edited by bougault
on 2023/01/11 14:47
Change comment: There is no comment for this version
To version 27.61
edited by bougault
on 2022/11/17 14:29
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -1,5 +1,5 @@
1 -
2 -{{html clean="false"}}<!--
1 +{{html clean="false"}}
2 +<!--
3 3   !!! POC. Code must be reviewed / optimized and packaged for use in production !!!
4 4   !!! Many optimisations can be done !!!
5 5  -->
... ... @@ -8,11 +8,20 @@
8 8  window.addEventListener('DOMContentLoaded', function() {
9 9  
10 10   class UnifiedSearch extends LitElement {
11 + /*
11 11   static properties = {
12 - results: { type: Array },
13 - resultsCache: { type: Array },
14 - collabFiltersResults: { type: Array}
13 + searchText: { type: String },
14 + favoritesFilter: { type: Boolean },
15 + administratorFilter: { type: Boolean },
16 + editorFilter: { type: Boolean },
17 + viewerFilter: { type: Boolean },
18 + publicFilter: { type: Boolean },
19 + privateFilter: { type: Boolean },
15 15   }
21 + */
22 + static properties = {
23 + results: { type: Array }
24 + }
16 16   static styles = css`
17 17   :host > div {
18 18   padding-bottom: 4em;
... ... @@ -39,12 +39,7 @@
39 39   this.filterUrl = new URL(`${document.location.origin}/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&limit=10000&favorite=false&roles=`);
40 40   this.results = [];
41 41   this.resultsCache = [];
42 - this.offset = 0;
43 - this.nb = 10;
44 44   }
45 - firstUpdated() {
46 - this.renderRoot.getElementById('searchInput').focus();
47 - }
48 48   toggleRoleFilter(roleName) {
49 49   if(this.rolesFilter.indexOf(roleName) === -1) {
50 50   this.rolesFilter.push(roleName);
... ... @@ -58,32 +58,24 @@
58 58   setSearchText(e) {
59 59   this.searchText = e.target.value;
60 60   }
61 - setOffset(e) {
62 - this.offset = e.target.value;
63 - }
64 - setNb(e) {
65 - this.nb = e.target.value;
66 - }
67 67   handleSearch(textSearch) {
68 68   if(this.searchText !== "" || textSearch) {
69 - // if(this.searchText !== this.prevSearchText) {
67 + if(this.searchText !== this.prevSearchText) {
70 70   this.clearResults();
71 71   this.prevSearchText = this.searchText;
72 72   this.fetchWikiSearch().then(results => {
73 - console.log('results', results);
74 - //this.resultsCache = results;
71 + this.resultsCache = results;
75 75   if(this.hasActiveFilters()) {
76 76   this.fetchFilterSearch().then(this.filterResults);
77 77   } else {
78 - this.results = results ? results : [];
75 + this.results = results;
79 79   }
80 80   })
81 - /*} else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) {
78 + } else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) {
82 82   this.fetchFilterSearch().then(this.filterResults)
83 83   } else {
84 84   this.results = this.resultsCache;
85 85   }
86 - */
87 87   } else {
88 88   this.clearResults();
89 89   console.log("no search text, should return filter search results if any");
... ... @@ -98,12 +98,12 @@
98 98   }
99 99   fetchWikiSearch() {
100 100   // request should be built from component, not from "external" dependency. Leave it here like this for POC.
101 - return handleXWikiSearch(this.searchText, this.offset, this.nb);
97 + return handleXWikiSearch(this.searchText);
102 102   }
103 103   fetchFilterSearch() {
104 104   return new Promise((resolve) => {
105 105   if(this.hasActiveFilters()) {
106 - fetch(this.filterUrl).then(res => res.json()).then((res) => resolve(res));
102 + fetch(this.filterUrl).then(res => res.json()).then(resolve);
107 107   } else {
108 108   resolve([]);
109 109   }
... ... @@ -121,7 +121,8 @@
121 121   return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`;
122 122   }
123 123   handleKeyPress(e) {
124 - if (e.keyCode === 13) {
120 + if(e.keyCode === 13) {
121 + e.preventDefault()
125 125   this.handleSearch(true);
126 126   }
127 127   }
... ... @@ -129,9 +129,7 @@
129 129   return html`
130 130  <div>
131 131   <div>
132 - <input id="searchInput" @change="${this.setSearchText}" type="text" placeholder="Search..." @keypress="${this.handleKeyPress}" />
133 - <input @change="${this.setNb}"" type="text" value="${this.nb}" />
134 - <input @change="${this.setOffset}"" type="text" value="${this.offset}" />
129 + <input @change="${this.setSearchText}" type="text" placeholder="Search..." @keypress="${this.handleKeyPress}" />
135 135   <button @click="${() => this.handleSearch(true)}">Search</button>
136 136   </div>
137 137   <div>
... ... @@ -148,21 +148,20 @@
148 148   </div>
149 149   `)}
150 150   </div>
146 +</div>
151 151  `
152 152   }
153 153   }
154 154   customElements.define('clb-unified-search', UnifiedSearch);
155 155  
156 - function handleXWikiSearch(searchString, offset, nb) {
152 + function handleXWikiSearch(searchString) {
157 157   return new Promise((resolve) => {
158 158   require(['jquery'], function($) {
159 159   const solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get');
160 160   //contextSearchButton.addEventListener('click', function() {
161 - $.get(solrServiceURL, {
157 + $.post(solrServiceURL, {
162 162   outputSyntax: 'plain',
163 163   media: 'json',
164 - nb: nb,
165 - offset: offset,
166 166   query: [
167 167   'q="__INPUT__"~100',
168 168   'fq=type:DOCUMENT',
... ... @@ -176,4 +176,7 @@
176 176   }
177 177  });
178 178  </script>
179 -<clb-unified-search></clb-unified-search>{{/html}}
173 +
174 +<clb-unified-search></clb-unified-search>
175 +
176 +{{/html}}