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.77
edited by bougault
on 2022/11/17 14:57
Change comment: There is no comment for this version
To version 26.69
edited by bougault
on 2022/11/17 10:13
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -1,139 +1,54 @@
1 1  {{html clean="false"}}
2 2  <!--
3 - !!! POC. Code must be reviewed / optimized and packaged for use in production !!!
4 - !!! Many optimisations can be done !!!
3 + !!! POC. Code would must be reviewed / optimized and packaged for use in production !!!
5 5  -->
6 6  <script type="module">
7 -import {LitElement, html, css} from 'https://cdn.jsdelivr.net/gh/lit/dist@2/core/lit-core.min.js';
8 -window.addEventListener('DOMContentLoaded', function() {
9 -
6 + import {LitElement, html} from 'https://cdn.jsdelivr.net/gh/lit/dist@2/core/lit-core.min.js';
10 10   class UnifiedSearch extends LitElement {
8 + /*
11 11   static properties = {
12 - results: { type: Array },
13 - resultsCache: { type: Array },
14 - collabFiltersResults: { type: Array}
10 + searchText: { type: String },
11 + favoritesFilter: { type: Boolean },
12 + administratorFilter: { type: Boolean },
13 + editorFilter: { type: Boolean },
14 + viewerFilter: { type: Boolean },
15 + publicFilter: { type: Boolean },
16 + privateFilter: { type: Boolean },
15 15   }
16 - static styles = css`
17 - :host > div {
18 - padding-bottom: 4em;
19 - }
20 - .result {
21 - margin-top: 1em;
22 - }
23 - .light {
24 - color: var(--color-gray-500, #CCC);
25 - font-size: 14px;
26 - }
27 - a {
28 - color: var(--color-brand-primary, blue);
29 - }
30 - .rawResults {
31 - width: 100%;
32 - display: flex;
33 - font-size: 12px;
34 - margin-top: 2em;
35 - }
36 - .rawResults pre {
37 - overflow: scroll;
38 - }
39 - `;
18 + */
40 40   constructor() {
41 41   super();
42 42   this.searchText = "";
43 - this.prevSearchText = "";
44 44   this.administrator = false;
45 45   this.editor = false;
46 46   this.viewer = false;
47 47   this.rolesFilter = [];
48 - this.filterUrl = new URL(`${document.location.origin}/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&limit=10000&favorite=false&roles=`);
49 - this.results = [];
50 - this.resultsCache = [];
51 - this.collabFiltersResults = [];
26 + this.filterUrl = new URL(`${document.location.origin}/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=true&roles=`);
52 52   }
53 - firstUpdated() {
54 - this.renderRoot.getElementById('searchInput').focus();
55 - }
56 56   toggleRoleFilter(roleName) {
57 - if(this.rolesFilter.indexOf(roleName) === -1) {
29 + if(this.rolesFilter.indexOf(roleName) == -1) {
58 58   this.rolesFilter.push(roleName);
59 59   } else {
60 - this.rolesFilter = this.rolesFilter.filter(role => role !== roleName);
32 + this.rolesFilter.filter(role => role !== roleName);
61 61   }
62 62   this[roleName] = !this[roleName];
63 63   this.filterUrl.searchParams.set('roles', this.rolesFilter.join("+"));
64 - this.handleSearch();
65 65   }
66 66   setSearchText(e) {
67 67   this.searchText = e.target.value;
68 68   }
69 - handleSearch(textSearch) {
70 - if(this.searchText !== "" || textSearch) {
71 - if(this.searchText !== this.prevSearchText) {
72 - this.clearResults();
73 - this.prevSearchText = this.searchText;
74 - this.fetchWikiSearch().then(results => {
75 - this.resultsCache = results;
76 - if(this.hasActiveFilters()) {
77 - this.fetchFilterSearch().then(this.filterResults);
78 - } else {
79 - this.results = results;
80 - }
81 - })
82 - } else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) {
83 - this.fetchFilterSearch().then(this.filterResults)
84 - } else {
85 - this.results = this.resultsCache;
86 - }
87 - } else {
88 - this.clearResults();
89 - console.log("no search text, should return filter search results if any");
90 - this.fetchFilterSearch().then(collabs => {
91 - console.log("Format and display collabs", collabs);
92 - })
93 - }
40 + handleSearch() {
41 + console.log(this.searchText);
94 94   }
95 - hasActiveFilters() {
96 - // we only look at role filters for POC.
97 - return this.rolesFilter.length > 0;
43 + buildFilter() {
44 + //https://wiki-dev.ebrains.eu/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=true&roles=
98 98   }
99 - fetchWikiSearch() {
100 - // request should be built from component, not from "external" dependency. Leave it here like this for POC.
101 - return handleXWikiSearch(this.searchText);
102 - }
103 - fetchFilterSearch() {
104 - return new Promise((resolve) => {
105 - if(this.hasActiveFilters()) {
106 - fetch(this.filterUrl).then(res => res.json()).then((res) => {
107 - this.collabFiltersResults = res;
108 - resolve(res);
109 - });
110 - } else {
111 - resolve([]);
112 - }
113 - });
114 - }
115 - filterResults = (filteredCollabs) => {
116 - const collabSpaces = filteredCollabs.map(collab => `Collabs.${collab.name}`);
117 - this.results = this.resultsCache.filter(result => collabSpaces.some(space => result.space.startsWith(space)));
118 - }
119 - clearResults() {
120 - this.results = [];
121 - this.resultsCache = [];
122 - }
123 - getLink(xwikiDocSpace) {
124 - return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`;
125 - }
126 - handleKeyPress(e) {
127 - if (e.keyCode === 13) {
128 - this.handleSearch(true);
129 - }
130 - }
131 131   render() {
132 132   return html`
133 133  <div>
134 134   <div>
135 - <input id="searchInput" @change="${this.setSearchText}" type="text" placeholder="Search..." @keypress="${this.handleKeyPress}" />
136 - <button @click="${() => this.handleSearch(true)}">Search</button>
50 + <input @change="${this.setSearchText}" type="text" placeholder="Search..." />
51 + <button @click="${this.handleSearch}">Search</button>
137 137   </div>
138 138   <div>
139 139   <label><input type="checkbox" @change="${() => this.toggleRoleFilter('administrator')}" .checked="${this.administratorFilter}"/> Administrator</label>
... ... @@ -140,51 +140,138 @@
140 140   <label><input type="checkbox" @change="${() => this.toggleRoleFilter('editor')}" .checked="${this.editorFilter}"/> Editor</label>
141 141   <label><input type="checkbox" @change="${() => this.toggleRoleFilter('viewer')}" .checked="${this.viewerFilter}"/> Viewer</label>
142 142   </div>
143 - <div>
144 - ${this.results.map(result => html`
145 - <div class="result">
146 - <a href="${this.getLink(result.space)}">${result.title_}</a>
147 - <div>${result.doccontent_.substring(0, 150)}
148 - <div class="light">${result.space.replaceAll('.', ' / ')}</div>
149 - </div>
150 - `)}
151 - </div>
152 - <div class="rawResults">
153 - <div>
154 - <strong>XWiki Search Results</strong>
155 - <ul>${this.resultsCache.map((res) => html`<li>${res.space}</li>`)}</ul>
156 - </div>
157 - <div>
158 - <strong>Collab Search Results (Filters)</strong>
159 - <pre>${this.collabFiltersResults.map((res) => html`<li>${res.name}</li>`)}</pre>
160 - </div>
161 - </div>
162 162  </div>
163 163  `
164 164   }
165 165   }
166 166   customElements.define('clb-unified-search', UnifiedSearch);
63 +</script>
167 167  
168 - function handleXWikiSearch(searchString) {
169 - return new Promise((resolve) => {
65 +<clb-unified-search></clb-unified-search>
66 +<!--
67 +<select id="context-search-type">
68 + <option value="all">All</option>
69 + <option value="collabs">Collabs</option>
70 + <option value="current-collab">Current Collab</option>
71 +</select>
72 +<input type="text" id="context-search-text" />
73 +<button id="context-search-button" class="btn btn-primary">Search</button>
74 +<div class="form-group">
75 + <label>
76 + <input type="checkbox" data-role-filter="administrator"> Administrator
77 + </label>
78 + <label>
79 + <input type="checkbox" data-role-filter="editor"> Editor
80 + </label>
81 +</div>
82 +
83 +
84 +<pre id="context-search-response"></pre>
85 +<script>
86 + window.addEventListener('DOMContentLoaded', function() {
87 + const filters = {
88 + search: '',
89 + offset: 0,
90 + orderField: 'title',
91 + order: 'asc',
92 + favorite: false,
93 + roles: [] // to be joined as administrator+editor+viewer
94 + };
95 +
96 + function addRole(role) {
97 + if(filters.roles.indexOf(role) == -1) {
98 + filters.roles.push(role);
99 + }
100 + }
101 +
102 + function removeRole(role) {
103 + filters.roles = filters.roles.filter(r => r !== role)
104 + }
105 +
106 + const filterInputs = document.querySelectorAll('input[data-role-filter]');
107 +
108 + filterInputs.forEach(function(filterIpt) {
109 + filterIpt.addEventListener('click', function() {
110 + const role = this.getAttribute('data-role-filter');
111 + if(this.checked) {
112 + addRole(role);
113 + } else {
114 + removeRole(role);
115 + }
116 + runFilteredRequest();
117 + })
118 + });
119 +
120 + function runFilteredRequest() {
121 + const urlParams = new URLSearchParams();
122 + const tmpFilters = filters;
123 + tmpFilters.roles = tmpFilters.roles.join("+");
124 + for(filter in tmpFilters) {
125 + urlParams.set(filter, tmpFilters[filter]);
126 + }
127 + console.log(urlParams);
128 + }
129 + // https://wiki-dev.ebrains.eu/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=false&roles=administrator
130 + const contextSearchType = document.getElementById("context-search-type");
131 + const contextSearchText = document.getElementById("context-search-text");
132 + const contextSearchResponse = document.getElementById("context-search-response");
133 + const contextSearchButton = document.getElementById("context-search-button");
134 + contextSearchButton.addEventListener('click', function() {
135 + const context = contextSearchType.options[contextSearchType.selectedIndex].value;
136 + const term = contextSearchText.value;
137 + switch(context) {
138 + case 'collabs':
139 + document.location.href = `/bin/view/Collabs/#search=${term}`;
140 + break;
141 + case 'current-collab':
142 + handleXWikiSearch('bougaultx');
143 + break
144 + default:
145 + handleXWikiSearch('')
146 + }
147 +
148 + });
149 + function handleXWikiSearch(space, callback) {
170 170   require(['jquery'], function($) {
171 - const solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get');
172 - //contextSearchButton.addEventListener('click', function() {
151 + var solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get');
152 + const contextSearchButton = document.getElementById("context-search-button");
153 + const xwikiSpace = space ? `.${space}` : '';
154 + contextSearchButton.addEventListener('click', function() {
173 173   $.post(solrServiceURL, {
174 - outputSyntax: 'plain',
175 - media: 'json',
176 - query: [
177 - 'q="__INPUT__"~100',
178 - 'fq=type:DOCUMENT',
179 - `fq=space:Collabs.*`
180 - ].join('\n'),
181 - input: searchString
182 - }).then(resolve);
183 - //});
184 - });
156 + outputSyntax: 'plain',
157 + media: 'json',
158 + query: [
159 + 'q="__INPUT__"~100',
160 + 'fq=type:DOCUMENT',
161 + `fq=space:Collabs${xwikiSpace}.*`
162 + ].join('\n'),
163 + input: $('#context-search-text').val()
164 + }).then(res => {
165 + if(callback) {
166 + callback(res).then(results => {
167 + contextSearchResponse.innerText = JSON.stringify(results, null, 2);
168 + })
169 + } else {
170 + contextSearchResponse.innerText = JSON.stringify(res, null, 2);
171 + }
172 + });
173 + });
185 185   });
186 186   }
176 + function applyAdministratorFilter(results) {
177 + return new Promise((resolve, reject) => {
178 + //fetch("/rest/v1/collabs?roles=administrator")
179 + fetch("/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=false&roles=administrator")
180 + .then(res => res.json())
181 + .then(collabs => {
182 + const spaces = collabs.map(collab => `Collabs.${collab.name}`);
183 + const filtered = results.filter(result => spaces.some(space => result.space.startsWith(space)));
184 + resolve(filtered);
185 + })
186 +
187 + })
188 + }
187 187  });
188 188  </script>
189 -<clb-unified-search></clb-unified-search>
191 +-->
190 190  {{/html}}