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

Summary

Details

Page properties
Content
... ... @@ -1,7 +1,6 @@
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 must be reviewed / optimized and packaged for use in production !!!
5 5  -->
6 6  <script type="module">
7 7  import {LitElement, html, css} from 'https://cdn.jsdelivr.net/gh/lit/dist@2/core/lit-core.min.js';
... ... @@ -23,9 +23,6 @@
23 23   results: { type: Array }
24 24   }
25 25   static styles = css`
26 - :host {
27 - padding-bottom: 4em;
28 - }
29 29   .result {
30 30   margin-top: 1em;
31 31   }
... ... @@ -47,7 +47,6 @@
47 47   this.rolesFilter = [];
48 48   this.filterUrl = new URL(`${document.location.origin}/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&limit=10000&favorite=false&roles=`);
49 49   this.results = [];
50 - this.resultsCache = [];
51 51   }
52 52   toggleRoleFilter(roleName) {
53 53   if(this.rolesFilter.indexOf(roleName) === -1) {
... ... @@ -62,26 +62,24 @@
62 62   setSearchText(e) {
63 63   this.searchText = e.target.value;
64 64   }
65 - handleSearch(textSearch) {
66 - if(this.searchText !== "" || textSearch) {
60 + handleSearch() {
61 +
62 + if(this.searchText !== "") {
67 67   if(this.searchText !== this.prevSearchText) {
68 - this.clearResults();
64 + console.log("1st")
65 + console.log(this.searchText, this.prevSearchText);
69 69   this.prevSearchText = this.searchText;
70 - this.fetchWikiSearch().then(results => {
71 - this.resultsCache = results;
72 - if(this.hasActiveFilters()) {
73 - this.fetchFilterSearch().then(this.filterResults);
74 - } else {
75 - this.results = results;
76 - }
77 - })
67 + Promise.all([
68 + this.fetchWikiSearch(),
69 + this.fetchFilterSearch()
70 + ]).then(([wikiSearchResults, collabSearchResults]) => {
71 + this.results = wikiSearchResults;
72 + console.log(wikiSearchResults, collabSearchResults);
73 + });
78 78   } else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) {
79 79   this.fetchFilterSearch().then(this.filterResults)
80 - } else {
81 - this.results = this.resultsCache;
82 82   }
83 83   } else {
84 - this.clearResults();
85 85   console.log("no search text, should return filter search results if any");
86 86   this.fetchFilterSearch().then(collabs => {
87 87   console.log("Format and display collabs", collabs);
... ... @@ -106,13 +106,11 @@
106 106   });
107 107   }
108 108   filterResults = (filteredCollabs) => {
102 + console.log("filteredCollabs:", filteredCollabs, "search results:", this.results);
109 109   const collabSpaces = filteredCollabs.map(collab => `Collabs.${collab.name}`);
110 - this.results = this.resultsCache.filter(result => collabSpaces.some(space => result.space.startsWith(space)));
104 + const filteredResults = this.results.filter(result => collabSpaces.some(space => result.space.startsWith(space)));
105 + this.results = filteredResults;
111 111   }
112 - clearResults() {
113 - this.results = [];
114 - this.resultsCache = [];
115 - }
116 116   getLink(xwikiDocSpace) {
117 117   return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`;
118 118   }
... ... @@ -121,7 +121,7 @@
121 121  <div>
122 122   <div>
123 123   <input @change="${this.setSearchText}" type="text" placeholder="Search..." />
124 - <button @click="${() => this.handleSearch(true)}">Search</button>
115 + <button @click="${this.handleSearch}">Search</button>
125 125   </div>
126 126   <div>
127 127   <label><input type="checkbox" @change="${() => this.toggleRoleFilter('administrator')}" .checked="${this.administratorFilter}"/> Administrator</label>