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.18
edited by bougault
on 2022/11/17 13:28
Change comment: There is no comment for this version
To version 26.63
edited by bougault
on 2022/11/17 09:54
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -1,13 +1,7 @@
1 1  {{html clean="false"}}
2 -<!--
3 - !!! POC. Code must be reviewed / optimized and packaged for use in production !!!
4 --->
5 5  <script type="module">
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 -
3 + import {LitElement, html} from 'https://cdn.jsdelivr.net/gh/lit/dist@2/core/lit-core.min.js';
9 9   class UnifiedSearch extends LitElement {
10 - /*
11 11   static properties = {
12 12   searchText: { type: String },
13 13   favoritesFilter: { type: Boolean },
... ... @@ -17,96 +17,27 @@
17 17   publicFilter: { type: Boolean },
18 18   privateFilter: { type: Boolean },
19 19   }
20 - */
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 - `;
36 36   constructor() {
37 37   super();
38 38   this.searchText = "";
39 - this.prevSearchText = "";
40 - this.administrator = false;
41 - this.editor = false;
42 - this.viewer = false;
43 - this.rolesFilter = [];
44 - this.filterUrl = new URL(`${document.location.origin}/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=&roles=`);
45 - this.results = [];
17 + this.favoritesFilter = false;
18 + this.administratorFilter = false;
19 + this.editorFilter = false;
20 + this.viewerFilter = false;
21 + this.publicFilter = false;
22 + this.privateFilter = false;
46 46   }
47 - toggleRoleFilter(roleName) {
48 - if(this.rolesFilter.indexOf(roleName) == -1) {
49 - this.rolesFilter.push(roleName);
50 - } else {
51 - this.rolesFilter.filter(role => role !== roleName);
52 - }
53 - this[roleName] = !this[roleName];
54 - this.filterUrl.searchParams.set('roles', this.rolesFilter.join("+"));
55 - this.handleSearch();
24 + toggleBooleanFilter(filterName) {
25 + this[filterName] = !this[filterName];
26 + console.log(this.administratorFilter);
56 56   }
57 57   setSearchText(e) {
58 58   this.searchText = e.target.value;
59 59   }
60 60   handleSearch() {
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 - }
32 + // check if text changed
33 + console.log(this.searchText);
82 82   }
83 - hasActiveFilters() {
84 - // we only look at role filters for POC.
85 - console.log(this.rolesFilter);
86 - return this.rolesFilter.length > 0;
87 - }
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 => collabsSpace.some(space => result.startsWith(space)));
105 - console.log(filteredResults);
106 - }
107 - getLink(xwikiDocSpace) {
108 - return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`;
109 - }
110 110   render() {
111 111   return html`
112 112  <div>
... ... @@ -115,47 +115,145 @@
115 115   <button @click="${this.handleSearch}">Search</button>
116 116   </div>
117 117   <div>
118 - <label><input type="checkbox" @change="${() => this.toggleRoleFilter('administrator')}" .checked="${this.administratorFilter}"/> Administrator</label>
119 - <label><input type="checkbox" @change="${() => this.toggleRoleFilter('editor')}" .checked="${this.editorFilter}"/> Editor</label>
120 - <label><input type="checkbox" @change="${() => this.toggleRoleFilter('viewer')}" .checked="${this.viewerFilter}"/> Viewer</label>
43 + <label><input type="checkbox" @change="${() => this.toggleBooleanFilter('favoritesFilter')}" .checked="${this.favoritesFilter}"/> Favorites</label>
44 + <label><input type="checkbox" @change="${() => this.toggleBooleanFilter('administratorFilter')}" .checked="${this.administratorFilter}"/> Administrator</label>
45 + <label><input type="checkbox" @change="${() => this.toggleBooleanFilter('editorFilter')}" .checked="${this.editorFilter}"/> Editor</label>
46 + <label><input type="checkbox" @change="${() => this.toggleBooleanFilter('viewerFilter')}" .checked="${this.viewerFilter}"/> Viewer</label>
47 + <label><input type="checkbox" @change="${() => this.toggleBooleanFilter('publicFilter')}" .checked="${this.publicFilter}"/> Public</label>
48 + <label><input type="checkbox" @change="${() => this.toggleBooleanFilter('privateFilter')}" .checked="${this.privateFilter}"/> Public</label>
121 121   </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>
131 131  </div>
132 132  `
133 133   }
134 134   }
135 135   customElements.define('clb-unified-search', UnifiedSearch);
55 +</script>
136 136  
137 - function handleXWikiSearch(searchString) {
138 - return new Promise((resolve) => {
57 +<clb-unified-search></clb-unified-search>
58 +<!--
59 +<select id="context-search-type">
60 + <option value="all">All</option>
61 + <option value="collabs">Collabs</option>
62 + <option value="current-collab">Current Collab</option>
63 +</select>
64 +<input type="text" id="context-search-text" />
65 +<button id="context-search-button" class="btn btn-primary">Search</button>
66 +<div class="form-group">
67 + <label>
68 + <input type="checkbox" data-role-filter="administrator"> Administrator
69 + </label>
70 + <label>
71 + <input type="checkbox" data-role-filter="editor"> Editor
72 + </label>
73 +</div>
74 +
75 +
76 +<pre id="context-search-response"></pre>
77 +<script>
78 + window.addEventListener('DOMContentLoaded', function() {
79 + const filters = {
80 + search: '',
81 + offset: 0,
82 + orderField: 'title',
83 + order: 'asc',
84 + favorite: false,
85 + roles: [] // to be joined as administrator+editor+viewer
86 + };
87 +
88 + function addRole(role) {
89 + if(filters.roles.indexOf(role) == -1) {
90 + filters.roles.push(role);
91 + }
92 + }
93 +
94 + function removeRole(role) {
95 + filters.roles = filters.roles.filter(r => r !== role)
96 + }
97 +
98 + const filterInputs = document.querySelectorAll('input[data-role-filter]');
99 +
100 + filterInputs.forEach(function(filterIpt) {
101 + filterIpt.addEventListener('click', function() {
102 + const role = this.getAttribute('data-role-filter');
103 + if(this.checked) {
104 + addRole(role);
105 + } else {
106 + removeRole(role);
107 + }
108 + runFilteredRequest();
109 + })
110 + });
111 +
112 + function runFilteredRequest() {
113 + const urlParams = new URLSearchParams();
114 + const tmpFilters = filters;
115 + tmpFilters.roles = tmpFilters.roles.join("+");
116 + for(filter in tmpFilters) {
117 + urlParams.set(filter, tmpFilters[filter]);
118 + }
119 + console.log(urlParams);
120 + }
121 + // https://wiki-dev.ebrains.eu/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=false&roles=administrator
122 + const contextSearchType = document.getElementById("context-search-type");
123 + const contextSearchText = document.getElementById("context-search-text");
124 + const contextSearchResponse = document.getElementById("context-search-response");
125 + const contextSearchButton = document.getElementById("context-search-button");
126 + contextSearchButton.addEventListener('click', function() {
127 + const context = contextSearchType.options[contextSearchType.selectedIndex].value;
128 + const term = contextSearchText.value;
129 + switch(context) {
130 + case 'collabs':
131 + document.location.href = `/bin/view/Collabs/#search=${term}`;
132 + break;
133 + case 'current-collab':
134 + handleXWikiSearch('bougaultx');
135 + break
136 + default:
137 + handleXWikiSearch('')
138 + }
139 +
140 + });
141 + function handleXWikiSearch(space, callback) {
139 139   require(['jquery'], function($) {
140 - const solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get');
141 - //contextSearchButton.addEventListener('click', function() {
143 + var solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get');
144 + const contextSearchButton = document.getElementById("context-search-button");
145 + const xwikiSpace = space ? `.${space}` : '';
146 + contextSearchButton.addEventListener('click', function() {
142 142   $.post(solrServiceURL, {
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 - });
148 + outputSyntax: 'plain',
149 + media: 'json',
150 + query: [
151 + 'q="__INPUT__"~100',
152 + 'fq=type:DOCUMENT',
153 + `fq=space:Collabs${xwikiSpace}.*`
154 + ].join('\n'),
155 + input: $('#context-search-text').val()
156 + }).then(res => {
157 + if(callback) {
158 + callback(res).then(results => {
159 + contextSearchResponse.innerText = JSON.stringify(results, null, 2);
160 + })
161 + } else {
162 + contextSearchResponse.innerText = JSON.stringify(res, null, 2);
163 + }
164 + });
165 + });
154 154   });
155 155   }
168 + function applyAdministratorFilter(results) {
169 + return new Promise((resolve, reject) => {
170 + //fetch("/rest/v1/collabs?roles=administrator")
171 + fetch("/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=false&roles=administrator")
172 + .then(res => res.json())
173 + .then(collabs => {
174 + const spaces = collabs.map(collab => `Collabs.${collab.name}`);
175 + const filtered = results.filter(result => spaces.some(space => result.space.startsWith(space)));
176 + resolve(filtered);
177 + })
178 +
179 + })
180 + }
156 156  });
157 157  </script>
158 -
159 -<clb-unified-search></clb-unified-search>
160 -
183 +-->
161 161  {{/html}}