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

Summary

Details

Page properties
Content
... ... @@ -41,56 +41,38 @@
41 41   this.editor = false;
42 42   this.viewer = false;
43 43   this.rolesFilter = [];
44 - this.filterUrl = new URL(`${document.location.origin}/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&limit=10000&favorite=false&roles=`);
44 + this.filterUrl = new URL(`${document.location.origin}/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=&roles=`);
45 45   this.results = [];
46 - this.resultsCache = [];
47 47   }
48 48   toggleRoleFilter(roleName) {
49 - if(this.rolesFilter.indexOf(roleName) === -1) {
48 + if(this.rolesFilter.indexOf(roleName) == -1) {
50 50   this.rolesFilter.push(roleName);
51 51   } else {
52 - this.rolesFilter = this.rolesFilter.filter(role => role !== roleName);
51 + this.rolesFilter.filter(role => role !== roleName);
53 53   }
54 54   this[roleName] = !this[roleName];
55 55   this.filterUrl.searchParams.set('roles', this.rolesFilter.join("+"));
56 - this.handleSearch();
55 + // if search text then apply filter
56 + // else return filters result
57 57   }
58 58   setSearchText(e) {
59 59   this.searchText = e.target.value;
60 60   }
61 - handleSearch(textSearch) {
62 - if(this.searchText !== "" || textSearch) {
63 - if(this.searchText !== this.prevSearchText) {
64 - this.clearResults();
65 - this.prevSearchText = this.searchText;
66 - this.fetchWikiSearch().then(results => {
67 - console.log(results);
68 - this.resultsCache = results;
69 - if(this.hasActiveFilters()) {
70 - this.fetchFilterSearch().then(this.filterResults);
71 - } else {
72 - this.results = results;
73 - }
74 - })
75 - /*
76 - Promise.all([
77 - this.fetchWikiSearch(),
78 - this.fetchFilterSearch()
79 - ]).then(([wikiSearchResults, collabSearchResults]) => {
80 - this.results = wikiSearchResults;
81 - this.resultsCache = wikiSearchResults;
82 - console.log(wikiSearchResults, collabSearchResults);
83 - });
84 - */
85 - } else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) {
86 - this.fetchFilterSearch().then(this.filterResults)
87 - } else {
88 - this.results = this.resultsCache;
89 - }
61 + handleSearch() {
62 + if(this.searchText !== "" && this.searchText !== this.prevSearchText) {
63 + this.prevSearchText = this.searchText;
64 + Promise.all([
65 + this.fetchWikiSearch(),
66 + this.fetchFilterSearch()
67 + ]).then(([wikiSearchResults, collabSearchResults]) => {
68 + console.log(wikiSearchResults, collabSearchResults);
69 + });
70 + } else if (this.searchText === this.prevSearchText) {
71 + console.log("Only apply filter on results");
72 + this.fetchFilterSearch().then(res => res.json()).then(this.filterResults)
90 90   } else {
91 - this.clearResults();
92 92   console.log("no search text, should return filter search results if any");
93 - this.fetchFilterSearch().then(collabs => {
75 + this.fetchFilterSearch().then(res => res.json()).then(collabs => {
94 94   console.log("Format and display collabs", collabs);
95 95   })
96 96   }
... ... @@ -97,7 +97,7 @@
97 97   }
98 98   hasActiveFilters() {
99 99   // we only look at role filters for POC.
100 - return this.rolesFilter.length > 0;
82 + return this.roles.length > 0;
101 101   }
102 102   fetchWikiSearch() {
103 103   // request should be built from component, not from "external" dependency. Leave it here like this for POC.
... ... @@ -105,21 +105,16 @@
105 105   }
106 106   fetchFilterSearch() {
107 107   return new Promise((resolve) => {
108 - if(this.hasActiveFilters()) {
109 - fetch(this.filterUrl).then(res => res.json()).then(resolve);
90 + if(hasActiveFilters) {
91 + fetch(this.filterUrl).then(console.log);
110 110   } else {
111 - resolve([]);
93 + resolve(null);
112 112   }
113 113   });
114 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)));
97 + filterResults(filteredCollabs) {
98 + console.log("filteredCollabs:", filteredCollabs, "search results:", this.results);
118 118   }
119 - clearResults() {
120 - this.results = [];
121 - this.resultsCache = [];
122 - }
123 123   getLink(xwikiDocSpace) {
124 124   return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`;
125 125   }
... ... @@ -128,7 +128,7 @@
128 128  <div>
129 129   <div>
130 130   <input @change="${this.setSearchText}" type="text" placeholder="Search..." />
131 - <button @click="${() => this.handleSearch(true)}">Search</button>
108 + <button @click="${this.handleSearch}">Search</button>
132 132   </div>
133 133   <div>
134 134   <label><input type="checkbox" @change="${() => this.toggleRoleFilter('administrator')}" .checked="${this.administratorFilter}"/> Administrator</label>