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.55
edited by bougault
on 2022/11/17 09:44
Change comment: There is no comment for this version
To version 26.5
edited by bougault
on 2022/11/16 12:24
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -1,49 +1,5 @@
1 1  {{html clean="false"}}
2 -<script type="module">
3 - import {LitElement, html} from 'https://cdn.jsdelivr.net/gh/lit/dist@2/core/lit-core.min.js';
4 - class UnifiedSearch extends LitElement {
5 - static properties = {
6 - searchText: { type: String },
7 - favoritesFilter: { type: Boolean },
8 - administratorFilter: { type: Boolean },
9 - editorFilter: { type: Boolean },
10 - viewerFilter: { type: Boolean },
11 - publicFilter: { type: Boolean },
12 - privateFilter: { type: Boolean },
13 - }
14 - constructor() {
15 - super();
16 - this.searchText = "";
17 - this.favoritesFilter = false;
18 - this.administratorFilter = true;
19 - this.editorFilter = false;
20 - this.viewerFilter = false;
21 - this.publicFilter = false;
22 - this.privateFilter = false;
23 - }
24 - setSearchText(e) {
25 - this.searchText = e.target.value;
26 - }
27 - handleSearch() {
28 - console.log(this.searchText);
29 - }
30 - render() {
31 - return html`
32 -<div>
33 - <div>
34 - <input @change="${this.setSearchText}" type="text" placeholder="Search..." />
35 - <button @click="${this.handleSearch}">Search</button>
36 - </div>
37 - <label><input type="checkbox" @change="${(e) => { this.administratorFilter = e.target.checked }}" .checked="${this.administratorFilter}"/> Administrator</label>
38 -</div>
39 -`
40 - }
41 - }
42 - customElements.define('clb-unified-search', UnifiedSearch);
43 -</script>
44 44  
45 -<clb-unified-search></clb-unified-search>
46 -
47 47  <select id="context-search-type">
48 48   <option value="all">All</option>
49 49   <option value="collabs">Collabs</option>
... ... @@ -51,62 +51,10 @@
51 51  </select>
52 52  <input type="text" id="context-search-text" />
53 53  <button id="context-search-button" class="btn btn-primary">Search</button>
54 -<div class="form-group">
55 - <label>
56 - <input type="checkbox" data-role-filter="administrator"> Administrator
57 - </label>
58 - <label>
59 - <input type="checkbox" data-role-filter="editor"> Editor
60 - </label>
61 -</div>
62 62  
63 -
64 64  <pre id="context-search-response"></pre>
65 65  <script>
66 66   window.addEventListener('DOMContentLoaded', function() {
67 - const filters = {
68 - search: '',
69 - offset: 0,
70 - orderField: 'title',
71 - order: 'asc',
72 - favorite: false,
73 - roles: [] // to be joined as administrator+editor+viewer
74 - };
75 -
76 - function addRole(role) {
77 - if(filters.roles.indexOf(role) == -1) {
78 - filters.roles.push(role);
79 - }
80 - }
81 -
82 - function removeRole(role) {
83 - filters.roles = filters.roles.filter(r => r !== role)
84 - }
85 -
86 - const filterInputs = document.querySelectorAll('input[data-role-filter]');
87 -
88 - filterInputs.forEach(function(filterIpt) {
89 - filterIpt.addEventListener('click', function() {
90 - const role = this.getAttribute('data-role-filter');
91 - if(this.checked) {
92 - addRole(role);
93 - } else {
94 - removeRole(role);
95 - }
96 - runFilteredRequest();
97 - })
98 - });
99 -
100 - function runFilteredRequest() {
101 - const urlParams = new URLSearchParams();
102 - const tmpFilters = filters;
103 - tmpFilters.roles = tmpFilters.roles.join("+");
104 - for(filter in tmpFilters) {
105 - urlParams.set(filter, tmpFilters[filter]);
106 - }
107 - console.log(urlParams);
108 - }
109 - // https://wiki-dev.ebrains.eu/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=false&roles=administrator
110 110   const contextSearchType = document.getElementById("context-search-type");
111 111   const contextSearchText = document.getElementById("context-search-text");
112 112   const contextSearchResponse = document.getElementById("context-search-response");
... ... @@ -114,6 +114,7 @@
114 114   contextSearchButton.addEventListener('click', function() {
115 115   const context = contextSearchType.options[contextSearchType.selectedIndex].value;
116 116   const term = contextSearchText.value;
21 + searchWithAdministratorFilter(term);
117 117   switch(context) {
118 118   case 'collabs':
119 119   document.location.href = `/bin/view/Collabs/#search=${term}`;
... ... @@ -122,11 +122,11 @@
122 122   handleXWikiSearch('bougaultx');
123 123   break
124 124   default:
125 - handleXWikiSearch('')
30 + handleXWikiSearch()
126 126   }
127 127  
128 128   });
129 - function handleXWikiSearch(space, callback) {
34 + function handleXWikiSearch(space) {
130 130   require(['jquery'], function($) {
131 131   var solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get');
132 132   const contextSearchButton = document.getElementById("context-search-button");
... ... @@ -142,29 +142,29 @@
142 142   ].join('\n'),
143 143   input: $('#context-search-text').val()
144 144   }).then(res => {
145 - if(callback) {
146 - callback(res).then(results => {
147 - contextSearchResponse.innerText = JSON.stringify(results, null, 2);
148 - })
149 - } else {
150 - contextSearchResponse.innerText = JSON.stringify(res, null, 2);
151 - }
50 + contextSearchResponse.innerText = JSON.stringify(res, null, 2);
152 152   });
153 153   });
154 154   });
155 155   }
156 - function applyAdministratorFilter(results) {
157 - return new Promise((resolve, reject) => {
158 - //fetch("/rest/v1/collabs?roles=administrator")
159 - fetch("/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=false&roles=administrator")
160 - .then(res => res.json())
161 - .then(collabs => {
162 - const spaces = collabs.map(collab => `Collabs.${collab.name}`);
163 - const filtered = results.filter(result => spaces.some(space => result.space.startsWith(space)));
164 - resolve(filtered);
165 - })
166 -
167 - })
55 + function searchWithAdministratorFilter(term) {
56 + let xwikiSpace = "";
57 + // parameters are set according to ticked filter. Hardcoded for POC
58 + Promise.all(
59 + fetch("/rest/v1/collabs?roles=administrator"),
60 + fetch("/bin/get/XWiki/SuggestSolrService", {
61 + method: "POST",
62 + body: {
63 + outputSyntax: 'plain',
64 + media: 'json',
65 + query: [
66 + 'q="__INPUT__"~100',
67 + 'fq=type:DOCUMENT',
68 + `fq=space:Collabs${xwikiSpace}.*`
69 + ].join('\n'),
70 + input: term
71 + }})
72 + ).then(res => console.log("Search with administrator", res))
168 168   }
169 169  });
170 170