Changes for page CLB Search Component
Last modified by bougault on 2023/01/17 11:42
Summary
-
Page properties (1 modified, 0 added, 0 removed)
Details
- Page properties
-
- Content
-
... ... @@ -9,110 +9,61 @@ 9 9 this.attachShadow({ mode: 'open'}); 10 10 } 11 11 12 - gettemplate() {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 - get styles() { 24 - return ''; 25 - } 26 - 27 - get html() { 28 - return ''; 29 - } 30 - $(selector) { 31 - return this.shadowRoot.querySelector(selector); 32 - } 33 - 34 - $$(selector) { 35 - return this.shadowRoot.querySelectorAll(selector); 36 - } 37 37 } 38 38 39 39 customElements.define('clb-simplified-search', 40 40 class extends ClbComponent { 41 - 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='; 42 42 constructor() { 43 43 super(); 44 44 this.results = []; 45 - this.offset = 0; 46 46 } 47 47 48 48 connectedCallback() { 28 + // this.attachShadow({ mode: 'open' }); 49 49 super.connectedCallback(); 50 50 this.render(); 51 - const searchInput = this.$('input[type="text"]'); 52 - this.$('#search').addEventListener('click', this.handleSearch); 53 - this.$('#prev').addEventListener('click', this.handlePrevPage); 54 - this.$('#next').addEventListener('click', this.handleNextPage); 55 - searchInput.addEventListener('keypress', this.handleKeyPress); 56 - searchInput.focus(); 31 + this.searchButton.addEventListener('click', () => this.handleSearch()); 57 57 } 58 58 59 - disconnectedCallback() { 60 - this.$('#search').removeEventListener('click', this.handleSearch); 61 - this.$('#prev').removeEventListener('click', this.handlePrevPage); 62 - this.$('#next').removeEventListener('click', this.handleNextPage); 63 - this.$('input[type="text"]').addEventListener('keypress', this.handleKeyPress); 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); 64 64 } 65 65 66 - get styles() { 67 - return ` 68 - input[type="text"] { 69 - border: 1px solid red; 70 - } 71 - ` 43 + get searchInput() { 44 + return this.shadowRoot.querySelector('input[type="text"]'); 72 72 } 73 - handlePrevPage = () => { 74 - if(this.offset > 0) { 75 - this.offset--; 76 - this.handleSearch(); 77 - } 78 - } 79 - handleNextPage = () => { 80 - this.offset++; 81 - this.handleSearch(); 82 - } 83 83 84 - handleSearch = () => { 85 - const value = this.$('input[type="text"]').value; 86 - fetch(`${this.searchBaseUrl}${encodeURIComponent(value)}&offset=${this.offset}`) 87 - .then(res => res.json()) 88 - .then(this.renderResults); 47 + get searchButton() { 48 + return this.shadowRoot.querySelector('button'); 89 89 } 90 90 91 - handleKeyPress = (e) => { 92 - if(e.code === 'Enter') { 93 - this.handleSearch(); 94 - } 51 + get searchInputTemplate() { 52 + return this.createTemplate('<div><input type="text"><button>Search</button><div id="results"></div></div>'); 95 95 } 96 96 97 - get html() { 98 - return ` 99 - <div> 100 - <input type="text"><button id="search">Search</button> 101 - <div id="results"></div> 102 - <button id="prev">prev</button> 103 - <button id="next">next</button> 104 - </div> 105 - `; 55 + resultsContainer = () => { 56 + return this.shadowRoot.querySelector('#results'); 106 106 } 107 107 108 - renderResults =(results)=>{109 - const resultsContainer = this. $('#results');59 + renderResults(results) { 60 + const resultsContainer = this.shadowRoot.querySelector('#results'); 110 110 resultsContainer.replaceChildren(); 111 111 for(let i = 0, j = results.length; i < j; i++) { 112 112 const { title_, spaces, doccontent_en } = results[i]; 113 113 const elt = document.createElement('clb-search-result'); 114 114 elt.setAttribute('data-title', title_); 115 - elt.setAttribute('data- breadcrumbs', spaces);66 + elt.setAttribute('data-href', spaces.join('/')); 116 116 elt.innerHTML = doccontent_en; 117 117 resultsContainer.appendChild(elt); 118 118 } ... ... @@ -119,7 +119,7 @@ 119 119 } 120 120 121 121 render() { 122 - this.shadowRoot.appendChild(this.template.content.cloneNode(true)); 73 + this.shadowRoot.appendChild(this.searchInputTemplate.content.cloneNode(true)); 123 123 } 124 124 } 125 125 ); ... ... @@ -134,33 +134,25 @@ 134 134 return this.getAttribute('data-title'); 135 135 } 136 136 137 - get breadcrumbsAttr() {138 - return this.getAttribute('data- breadcrumbs');88 + get hrefAttr() { 89 + return this.getAttribute('data-href'); 139 139 } 140 140 141 - get styles() { 142 - return ` 143 - a { 144 - color: var(--color-brand-primary); 145 - } 146 - `; 147 - } 148 - get html() { 149 - return ` 92 + get resultTemplate() { 93 + return this.createTemplate(` 150 150 <div> 151 - <a href= "/bin/view/${this.breadcrumbsAttr.join("/")}>${this.titleAttr}</a>95 + <a href=${this.hrefAttr}>${this.titleAttr}</a> 152 152 <div> 153 153 <slot></slot> 154 154 </div> 155 - </div> ` 99 + </div> 100 + `); 156 156 } 157 - 158 158 connectedCallback() { 159 159 this.attachShadow({ mode: 'open' }); 160 - this.shadowRoot.appendChild(this.template.content.cloneNode(true)); 104 + this.shadowRoot.appendChild(this.resultTemplate.content.cloneNode(true)); 161 161 } 162 162 } 163 163 ); 164 164 </script> 165 -<clb-simplified-search></clb-simplified-search> 166 166 {{/html}}