| ... |
... |
@@ -9,92 +9,55 @@ |
| 9 |
9 |
this.attachShadow({ mode: 'open'}); |
| 10 |
10 |
} |
| 11 |
11 |
|
| 12 |
|
- get template() { |
|
12 |
+ createTemplate(htmlString) { |
| 13 |
13 |
const template = document.createElement('template'); |
| 14 |
|
- template.innerHTML = ` |
| 15 |
|
- <style> |
| 16 |
|
- ${this.styles} |
| 17 |
|
- </style> |
| 18 |
|
- ${this.html} |
| 19 |
|
- `; |
|
14 |
+ template.innerHTML = htmlString; |
| 20 |
20 |
return template; |
| 21 |
21 |
} |
| 22 |
|
- |
| 23 |
|
- |
| 24 |
|
- get styles() { |
| 25 |
|
- return ``; |
| 26 |
|
- } |
| 27 |
|
- $(selector) { |
| 28 |
|
- return this.shadowRoot.querySelector(selector); |
| 29 |
|
- } |
| 30 |
|
- |
| 31 |
|
- $$(selector) { |
| 32 |
|
- return this.shadowRoot.querySelectorAll(selector); |
| 33 |
|
- } |
| 34 |
34 |
} |
| 35 |
35 |
|
| 36 |
36 |
customElements.define('clb-simplified-search', |
| 37 |
37 |
class extends ClbComponent { |
| 38 |
|
- searchBaseUrl = '/bin/get/XWiki/SuggestSolrService?outputSyntax=plain&media=json&nb=10&query=q%3D%22__INPUT__%22~100%0Afq%3Dtype%3ADOCUMENT%0Afq%3Dspace%3ACollabs.*&input='; |
|
21 |
+ searchBaseUrl = 'https://wiki-dev.ebrains.eu/bin/get/XWiki/SuggestSolrService?outputSyntax=plain&media=json&nb=10&offset=0&query=q%3D%22__INPUT__%22~100%0Afq%3Dtype%3ADOCUMENT%0Afq%3Dspace%3ACollabs.*&input='; |
| 39 |
39 |
constructor() { |
| 40 |
40 |
super(); |
| 41 |
41 |
this.results = []; |
| 42 |
|
- this.offset = 0; |
| 43 |
43 |
} |
| 44 |
44 |
|
| 45 |
45 |
connectedCallback() { |
|
28 |
+ // this.attachShadow({ mode: 'open' }); |
| 46 |
46 |
super.connectedCallback(); |
| 47 |
47 |
this.render(); |
| 48 |
|
- this.$('#search').addEventListener('click', this.handleSearch); |
| 49 |
|
- this.$('#prev').addEventListener('click', this.handlePrevPage); |
| 50 |
|
- this.$('#next').addEventListener('click', this.handleNextPage; |
|
31 |
+ this.searchButton.addEventListener('click', () => this.handleSearch()); |
| 51 |
51 |
} |
| 52 |
52 |
|
| 53 |
|
- disconnectedCallback() { |
| 54 |
|
- this.$('#search').removeEventListener('click', this.handleSearch; |
| 55 |
|
- this.$('#prev').removeEventListener('click', this.handlePrevPage); |
| 56 |
|
- this.$('#next').removeEventListener('click', this.handleNextPage); |
|
34 |
+ |
|
35 |
+ handleSearch() { |
|
36 |
+ // fetch(`${this.searchBaseUrl}${encodeURIComponent(this.searchInput.value)}`) |
|
37 |
+ // .then(res => res.json()) |
|
38 |
+ //.then(this.renderResults); |
|
39 |
+ const res = [{"id":"xwiki:Collabs.bougault.Collabs Search.WebHome_en","hidden":false,"wiki":"xwiki","name":"WebHome","space":"Collabs.bougault.Collabs Search","spaces":["Collabs","bougault","Collabs Search"],"locale":"en","language":"en","type":"DOCUMENT","fullname":"Collabs.bougault.Collabs Search.WebHome","title_en":["Collabs Search"],"title_":"Collabs Search","doccontentraw_en":["{{velocity output=\"false\"}}\r\n #set($displayContentFooter=false)\r\n #set($displayDocExtra=false)\r\n #set($displayContentMenu=false)\r\n $xwiki.ssx.use('Collaboratory.UX.SSX.noheader')\r\n\r\n #set ($clbaction = $request.getParameter(\"clbaction\"))\r\n #set ($isCreationForm = $clbaction.equals('create'))\r\n #set ($isAuthenticated = ($xcontext.user != 'XWiki.XWikiGuest'))\r\n #if($isCreationForm)\r\n #set ($moduleCSS = 'collab-settings.css')\r\n #set ($moduleJS = 'collab-settings.js')\r\n #else\r\n #set ($moduleCSS = 'collab-search.css')\r\n #set ($moduleJS = 'collab-search.js')\r\n #end\r\n{{/velocity}}\r\n\r\n{{velocity}}\r\n\r\n{{html wiki=\"true\"}}\r\n\r\n #if($isCreationForm)\r\n (% id=\"root\" %)((()))\r\n #else\r\n (% class=\"container\" %)\r\n (((\r\n #if($isAuthenticated)\r\n (% class=\"row\" %)\r\n (((\r\n (% class=\"col-md-6 pull-right\" %)\r\n (((\r\n {{html}}\r\n <a href=\"/bin/view/Collabs?clbaction=create\" class=\"btn btn-primary pull-right\">Create a collab</a>\r\n {{/html}}\r\n )))\r\n )))\r\n #end\r\n )))\r\n (% id=\"root\" %)((()))\r\n #end\r\n{{/html}}\r\n\r\n{{html clean=\"false\"}}\r\n <link rel=\"stylesheet\" type=\"text/css\" href=\"$services.webjars.url('eu.hbp.wiki:xwiki-webapp-collaboratory', $moduleCSS)\" />\r\n <script type=\"module\" src=\"$services.webjars.url('eu.hbp.wiki:xwiki-webapp-collaboratory', $moduleJS)\"></script>\r\n{{/html}}\r\n\r\n{{/velocity}}\r\n\r\n\r\n"],"doccontentraw_":"{{velocity output=\"false\"}}\r\n #set($displayContentFooter=false)\r\n #set($displayDocExtra=false)\r\n #set($displayContentMenu=false)\r\n $xwiki.ssx.use('Collaboratory.UX.SSX.noheader')\r\n\r\n #set ($clbaction = $request.getParameter(\"clbaction\"))\r\n #set ($isCreationForm = $clbaction.equals('create'))\r\n #set ($isAuthenticated = ($xcontext.user != 'XWiki.XWikiGuest'))\r\n #if($isCreationForm)\r\n #set ($moduleCSS = 'collab-settings.css')\r\n #set ($moduleJS = 'collab-settings.js')\r\n #else\r\n #set ($moduleCSS = 'collab-search.css')\r\n #set ($moduleJS = 'collab-search.js')\r\n #end\r\n{{/velocity}}\r\n\r\n{{velocity}}\r\n\r\n{{html wiki=\"true\"}}\r\n\r\n #if($isCreationForm)\r\n (% id=\"root\" %)((()))\r\n #else\r\n (% class=\"container\" %)\r\n (((\r\n #if($isAuthenticated)\r\n (% class=\"row\" %)\r\n (((\r\n (% class=\"col-md-6 pull-right\" %)\r\n (((\r\n {{html}}\r\n <a href=\"/bin/view/Collabs?clbaction=create\" class=\"btn btn-primary pull-right\">Create a collab</a>\r\n {{/html}}\r\n )))\r\n )))\r\n #end\r\n )))\r\n (% id=\"root\" %)((()))\r\n #end\r\n{{/html}}\r\n\r\n{{html clean=\"false\"}}\r\n <link rel=\"stylesheet\" type=\"text/css\" href=\"$services.webjars.url('eu.hbp.wiki:xwiki-webapp-collaboratory', $moduleCSS)\" />\r\n <script type=\"module\" src=\"$services.webjars.url('eu.hbp.wiki:xwiki-webapp-collaboratory', $moduleJS)\"></script>\r\n{{/html}}\r\n\r\n{{/velocity}}\r\n\r\n\r\n","doccontent_en":["\n\n"],"doccontent_":"\n\n","version":"28.1","doclocale":"","locales":["","en"],"lang":["","en"],"author":"xwiki:XWiki.bougault","author_display":"François B.","creator":"xwiki:XWiki.bougault","creator_display":"François B.","creationdate":1617976623000,"date":1618401384000,"_version_":1752657755570700288,"score":7.453887},{"id":"xwiki:Collabs.collab-dev.WebHome_en","hidden":false,"wiki":"xwiki","name":"WebHome","space":"Collabs.collab-dev","spaces":["Collabs","collab-dev"],"locale":"en","language":"en","type":"DOCUMENT","fullname":"Collabs.collab-dev.WebHome","title_en":["Collab dev"],"title_":"Collab dev","doccontentraw_en":["(% class=\"jumbotron\" %)\n(((\n(% class=\"container\" %)\n(((\n= My Collab's Extended Title =\n\nMy collab's subtitle\n)))\n)))\n\n(% class=\"row\" %)\n(((\n(% class=\"col-xs-12 col-sm-8\" %)\n(((\n= What can I find here? =\n\n* Notice how the table of contents on the right\n* is automatically updated\n* to hold this page's headers\n\n= Who has access? =\n\nDescribe the audience of this collab.\n)))\n\n\n(% class=\"col-xs-12 col-sm-4\" %)\n(((\n{{box title=\"**Contents**\"}}\n{{toc/}}\n{{/box}}\n\n \n)))\n)))"],"doccontentraw_":"(% class=\"jumbotron\" %)\n(((\n(% class=\"container\" %)\n(((\n= My Collab's Extended Title =\n\nMy collab's subtitle\n)))\n)))\n\n(% class=\"row\" %)\n(((\n(% class=\"col-xs-12 col-sm-8\" %)\n(((\n= What can I find here? =\n\n* Notice how the table of contents on the right\n* is automatically updated\n* to hold this page's headers\n\n= Who has access? =\n\nDescribe the audience of this collab.\n)))\n\n\n(% class=\"col-xs-12 col-sm-4\" %)\n(((\n{{box title=\"**Contents**\"}}\n{{toc/}}\n{{/box}}\n\n \n)))\n)))","doccontent_en":["My Collab's Extended Title\n\nMy collab's subtitle\n\nWhat can I find here?\n\nNotice how the table of contents on the right\nis automatically updated\nto hold this page's headers\n\nWho has access?\n\nDescribe the audience of this collab.\n\n\n "],"doccontent_":"My Collab's Extended Title\n\nMy collab's subtitle\n\nWhat can I find here?\n\nNotice how the table of contents on the right\nis automatically updated\nto hold this page's headers\n\nWho has access?\n\nDescribe the audience of this collab.\n\n\n ","version":"10.1","doclocale":"","locales":["","en"],"lang":["","en"],"author":"xwiki:XWiki.messines","author_display":"Axel M.","creator":"xwiki:XWiki.collaboratory","creator_display":"collaboratory","creationdate":1558605692000,"date":1663716732000,"property.Collaboratory.Apps.Collab.Code.CollabClass.chat_boolean":[false],"object.Collaboratory.Apps.Collab.Code.CollabClass_en":["false","","All usefull contents for collaboratory developers.","true","messines"],"objcontent_en":["chat : false","content : ","description : All usefull contents for collaboratory developers.","drive : true","menu : ","owner : messines","public : false","title : ","allow : true","groups : Collabs.collab-dev._.groups.collab-collab-dev-viewer","levels : view,comment","users : ","groups : Collabs.collab-dev._.groups.collab-collab-dev-editor","levels : view,comment,edit","groups : Collabs.collab-dev._.groups.collab-collab-dev-administrator","levels : view,comment,edit,delete"],"property.Collaboratory.Apps.Collab.Code.CollabClass.content_string":[""],"property.Collaboratory.Apps.Collab.Code.CollabClass.description_en":["All usefull contents for collaboratory developers."],"property.Collaboratory.Apps.Collab.Code.CollabClass.drive_boolean":[true],"property.Collaboratory.Apps.Collab.Code.CollabClass.menu_string":[""],"property.Collaboratory.Apps.Collab.Code.CollabClass.owner_en":["messines"],"property.Collaboratory.Apps.Collab.Code.CollabClass.owner_string":["messines"],"property.Collaboratory.Apps.Collab.Code.CollabClass.public_boolean":[false],"property.Collaboratory.Apps.Collab.Code.CollabClass.title_string":[""],"class":["Collaboratory.Apps.Collab.Code.CollabClass","XWiki.XWikiRights"],"property.XWiki.XWikiRights.allow_boolean":[true,true,true],"object.XWiki.XWikiRights_en":["true","Collabs.collab-dev._.groups.collab-collab-dev-viewer","view,comment","","Collabs.collab-dev._.groups.collab-collab-dev-editor","view,comment,edit","Collabs.collab-dev._.groups.collab-collab-dev-administrator","view,comment,edit,delete"],"property.XWiki.XWikiRights.groups_string":["Collabs.collab-dev._.groups.collab-collab-dev-viewer","Collabs.collab-dev._.groups.collab-collab-dev-editor","Collabs.collab-dev._.groups.collab-collab-dev-administrator"],"property.XWiki.XWikiRights.levels_string":["view,comment","view,comment,edit","view,comment,edit,delete"],"property.XWiki.XWikiRights.users_string":["","",""],"_version_":1752657767917682688,"score":7.453887}]; |
|
40 |
+ this.renderResults(res); |
| 57 |
57 |
} |
| 58 |
58 |
|
| 59 |
|
- get styles() { |
| 60 |
|
- return ` |
| 61 |
|
- input[type="text"] { |
| 62 |
|
- border: 1px solid red; |
| 63 |
|
- } |
| 64 |
|
- ` |
|
43 |
+ get searchInput() { |
|
44 |
+ return this.shadowRoot.querySelector('input[type="text"]'); |
| 65 |
65 |
} |
| 66 |
|
- handlePrevPage = () => { |
| 67 |
|
- if(this.offset > 0) { |
| 68 |
|
- this.offset--; |
| 69 |
|
- this.handleSearch(); |
| 70 |
|
- } |
|
46 |
+ |
|
47 |
+ get searchButton() { |
|
48 |
+ return this.shadowRoot.querySelector('button'); |
| 71 |
71 |
} |
| 72 |
|
- handleNextPage = () => { |
| 73 |
|
- this.offset++; |
| 74 |
|
- this.handleSearch(); |
| 75 |
|
- } |
| 76 |
76 |
|
| 77 |
|
- handleSearch = () => { |
| 78 |
|
- const value = this.$('input[type="text"]').value; |
| 79 |
|
- fetch(`${this.searchBaseUrl}${encodeURIComponent(value)}&offset=${this.offset}`) |
| 80 |
|
- .then(res => res.json()) |
| 81 |
|
- .then(this.renderResults); |
|
51 |
+ get searchInputTemplate() { |
|
52 |
+ return this.createTemplate('<div><input type="text"><button>Search</button><div id="results"></div></div>'); |
| 82 |
82 |
} |
| 83 |
83 |
|
| 84 |
|
- |
| 85 |
|
- get html() { |
| 86 |
|
- return ` |
| 87 |
|
- <div> |
| 88 |
|
- <input type="text"><button id="search">Search</button> |
| 89 |
|
- <div id="results"></div> |
| 90 |
|
- <button id="prev">prev</button> |
| 91 |
|
- <button id="next">next</button> |
| 92 |
|
- </div> |
| 93 |
|
- `; |
|
55 |
+ resultsContainer = () => { |
|
56 |
+ return this.shadowRoot.querySelector('#results'); |
| 94 |
94 |
} |
| 95 |
95 |
|
| 96 |
|
- renderResults = (results) => { |
| 97 |
|
- const resultsContainer = this.$('#results'); |
|
59 |
+ renderResults(results) { |
|
60 |
+ const resultsContainer = this.shadowRoot.querySelector('#results'); |
| 98 |
98 |
resultsContainer.replaceChildren(); |
| 99 |
99 |
for(let i = 0, j = results.length; i < j; i++) { |
| 100 |
100 |
const { title_, spaces, doccontent_en } = results[i]; |
| ... |
... |
@@ -107,7 +107,7 @@ |
| 107 |
107 |
} |
| 108 |
108 |
|
| 109 |
109 |
render() { |
| 110 |
|
- this.shadowRoot.appendChild(this.template.content.cloneNode(true)); |
|
73 |
+ this.shadowRoot.appendChild(this.searchInputTemplate.content.cloneNode(true)); |
| 111 |
111 |
} |
| 112 |
112 |
} |
| 113 |
113 |
); |
| ... |
... |
@@ -126,29 +126,21 @@ |
| 126 |
126 |
return this.getAttribute('data-href'); |
| 127 |
127 |
} |
| 128 |
128 |
|
| 129 |
|
- get styles() { |
| 130 |
|
- return ` |
| 131 |
|
- a { |
| 132 |
|
- color: var(--color-brand-primary); |
| 133 |
|
- } |
| 134 |
|
- `; |
| 135 |
|
- } |
| 136 |
|
- get html() { |
| 137 |
|
- return ` |
|
92 |
+ get resultTemplate() { |
|
93 |
+ return this.createTemplate(` |
| 138 |
138 |
<div> |
| 139 |
139 |
<a href=${this.hrefAttr}>${this.titleAttr}</a> |
| 140 |
140 |
<div> |
| 141 |
141 |
<slot></slot> |
| 142 |
142 |
</div> |
| 143 |
|
- </div> ` |
|
99 |
+ </div> |
|
100 |
+ `); |
| 144 |
144 |
} |
| 145 |
|
- |
| 146 |
146 |
connectedCallback() { |
| 147 |
147 |
this.attachShadow({ mode: 'open' }); |
| 148 |
|
- this.shadowRoot.appendChild(this.template.content.cloneNode(true)); |
|
104 |
+ this.shadowRoot.appendChild(this.resultTemplate.content.cloneNode(true)); |
| 149 |
149 |
} |
| 150 |
150 |
} |
| 151 |
151 |
); |
| 152 |
152 |
</script> |
| 153 |
|
-<clb-simplified-search></clb-simplified-search> |
| 154 |
154 |
{{/html}} |