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

Summary

Details

Page properties
Content
... ... @@ -1,9 +1,11 @@
1 1  {{html clean="false"}}
2 2  <!--
3 - !!! POC. Code would must be reviewed / optimized and packaged for use in production !!!
3 + !!! POC. Code must be reviewed / optimized and packaged for use in production !!!
4 4  -->
5 5  <script type="module">
6 - import {LitElement, html} from 'https://cdn.jsdelivr.net/gh/lit/dist@2/core/lit-core.min.js';
6 +import {LitElement, html, css} from 'https://cdn.jsdelivr.net/gh/lit/dist@2/core/lit-core.min.js';
7 +window.addEventListener('DOMContentLoaded', function() {
8 +
7 7   class UnifiedSearch extends LitElement {
8 8   /*
9 9   static properties = {
... ... @@ -16,14 +16,31 @@
16 16   privateFilter: { type: Boolean },
17 17   }
18 18   */
21 + static properties = {
22 + results: { type: Array }
23 + }
24 + static styles = css`
25 + .result {
26 + margin-top: 1em;
27 + }
28 + .light {
29 + color: var(--color-gray-500, #CCC);
30 + font-size: 14px;
31 + }
32 + a {
33 + color: var(--color-brand-primary, blue);
34 + }
35 + `;
19 19   constructor() {
20 20   super();
21 21   this.searchText = "";
39 + this.prevSearchText = "";
22 22   this.administrator = false;
23 23   this.editor = false;
24 24   this.viewer = false;
25 25   this.rolesFilter = [];
26 - this.filterUrl = new URL(`${document.location.origin}/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=true&roles=`);
44 + this.filterUrl = new URL(`${document.location.origin}/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=false&roles=`);
45 + this.results = [];
27 27   }
28 28   toggleRoleFilter(roleName) {
29 29   if(this.rolesFilter.indexOf(roleName) == -1) {
... ... @@ -33,16 +33,61 @@
33 33   }
34 34   this[roleName] = !this[roleName];
35 35   this.filterUrl.searchParams.set('roles', this.rolesFilter.join("+"));
55 + this.handleSearch();
36 36   }
37 37   setSearchText(e) {
38 38   this.searchText = e.target.value;
39 39   }
40 40   handleSearch() {
41 - console.log(this.searchText);
61 + if(this.searchText !== "") {
62 + if(this.searchText !== this.prevSearchText) {
63 + console.log(this.searchText, this.prevSearchText);
64 + this.prevSearchText = this.searchText;
65 + Promise.all([
66 + this.fetchWikiSearch(),
67 + this.fetchFilterSearch()
68 + ]).then(([wikiSearchResults, collabSearchResults]) => {
69 + this.results = wikiSearchResults;
70 + console.log(wikiSearchResults, collabSearchResults);
71 + });
72 + } else if (this.searchText === this.prevSearchText) {
73 + console.log("Only apply filter on results");
74 + this.fetchFilterSearch().then(this.filterResults)
75 + }
76 + } else {
77 + console.log("no search text, should return filter search results if any");
78 + this.fetchFilterSearch().then(collabs => {
79 + console.log("Format and display collabs", collabs);
80 + })
81 + }
42 42   }
43 - buildFilter() {
44 - //https://wiki-dev.ebrains.eu/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=true&roles=
83 + hasActiveFilters() {
84 + // we only look at role filters for POC.
85 + console.log('rolesfilter', this.rolesFilter);
86 + return this.rolesFilter.length > 0;
45 45   }
88 + fetchWikiSearch() {
89 + // request should be built from component, not from "external" dependency. Leave it here like this for POC.
90 + return handleXWikiSearch(this.searchText);
91 + }
92 + fetchFilterSearch() {
93 + return new Promise((resolve) => {
94 + if(this.hasActiveFilters()) {
95 + fetch(this.filterUrl).then(res => res.json()).then(resolve);
96 + } else {
97 + resolve(null);
98 + }
99 + });
100 + }
101 + filterResults = (filteredCollabs) => {
102 + console.log("filteredCollabs:", filteredCollabs, "search results:", this.results);
103 + const collabSpaces = filteredCollabs.map(collab => `Collabs.${collab.name}`);
104 + const filteredResults = this.results.filter(result => collabSpaces.some(space => result.space.startsWith(space)));
105 + console.log(filteredResults);
106 + }
107 + getLink(xwikiDocSpace) {
108 + return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`;
109 + }
46 46   render() {
47 47   return html`
48 48  <div>
... ... @@ -55,138 +55,43 @@
55 55   <label><input type="checkbox" @change="${() => this.toggleRoleFilter('editor')}" .checked="${this.editorFilter}"/> Editor</label>
56 56   <label><input type="checkbox" @change="${() => this.toggleRoleFilter('viewer')}" .checked="${this.viewerFilter}"/> Viewer</label>
57 57   </div>
122 + <div>
123 + ${this.results.map(result => html`
124 + <div class="result">
125 + <a href="${this.getLink(result.space)}">${result.title_}</a>
126 + <div>${result.doccontent_.substring(0, 150)}
127 + <div class="light">${result.space.replaceAll('.', ' / ')}</div>
128 + </div>
129 + `)}
130 + </div>
58 58  </div>
59 59  `
60 60   }
61 61   }
62 62   customElements.define('clb-unified-search', UnifiedSearch);
63 -</script>
64 64  
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) {
137 + function handleXWikiSearch(searchString) {
138 + return new Promise((resolve) => {
150 150   require(['jquery'], 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() {
140 + const solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get');
141 + //contextSearchButton.addEventListener('click', function() {
155 155   $.post(solrServiceURL, {
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 - });
143 + outputSyntax: 'plain',
144 + media: 'json',
145 + query: [
146 + 'q="__INPUT__"~100',
147 + 'fq=type:DOCUMENT',
148 + `fq=space:Collabs.*`
149 + ].join('\n'),
150 + input: searchString
151 + }).then(resolve);
152 + //});
153 + });
174 174   });
175 175   }
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 - }
189 189  });
190 190  </script>
191 --->
158 +
159 +<clb-unified-search></clb-unified-search>
160 +
192 192  {{/html}}