Changes for page Context Search

Last modified by bougault on 2023/02/20 16:29

From 4.8 to 4.7 From 31.7 to 31.6

From version 31.6

edited by bougault
on 2023/01/11 14:47

Change comment: There is no comment for this version

To version 4.8

edited by bougault
on 2022/10/14 08:04

Change comment: There is no comment for this version

Raw
Rendered

Summary

Page properties (1 modified, 0 added, 0 removed)

Details

Page properties

Content

@@ -1,179 +1,68 @@
++{{html clean="false"}}
--{{html clean="false"}}<!--
--  !!! POC. Code must be reviewed / optimized and packaged for use in production  !!!
--  !!! Many optimisations can be done                                             !!!
---->
--<script type="module">
--import {LitElement, html, css} from 'https://cdn.jsdelivr.net/gh/lit/dist@2/core/lit-core.min.js';
--window.addEventListener('DOMContentLoaded', function() {
++<select id="context-search-type">
++  <option value="all">All</option>
++  <option value="collabs">Collabs</option>
++  <option value="current-collab">Current Collab</option>
++</select>
++<input type="text" id="context-search-text" />
++<button id="context-search-button" class="btn btn-primary">Search</button>
--  class UnifiedSearch extends LitElement {
--    static properties = {
--      results: { type: Array },
--      resultsCache: { type: Array },
--      collabFiltersResults: { type: Array}
--    }
--    static styles = css`
--      :host > div {
--        padding-bottom: 4em;
--      }
--      .result {
--        margin-top: 1em;
--      }
--      .light {
--        color: var(--color-gray-500, #CCC);
--        font-size: 14px;
--      }
--      a {
--        color: var(--color-brand-primary, blue);
--      }
--    `;
--    constructor() {
--      super();
--      this.searchText = "";
--      this.prevSearchText = "";
--      this.administrator = false;
--      this.editor = false;
--      this.viewer = false;
--      this.rolesFilter = [];
--      this.filterUrl = new URL(`${document.location.origin}/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&limit=10000&favorite=false&roles=`);
--      this.results = [];
--      this.resultsCache = [];
--      this.offset = 0;
--      this.nb = 10;
--    }
--    firstUpdated() {
--      this.renderRoot.getElementById('searchInput').focus();
--    }
--    toggleRoleFilter(roleName) {
--      if(this.rolesFilter.indexOf(roleName) === -1) {
--        this.rolesFilter.push(roleName);
--      } else {
--        this.rolesFilter = this.rolesFilter.filter(role => role !== roleName);
--      }
--      this[roleName] = !this[roleName];
--      this.filterUrl.searchParams.set('roles', this.rolesFilter.join("+"));
--      this.handleSearch();
--    }
--    setSearchText(e) {
--      this.searchText = e.target.value;
--    }
--    setOffset(e) {
--      this.offset = e.target.value;
--    }
--    setNb(e) {
--      this.nb = e.target.value;
--    }
--    handleSearch(textSearch) {
--      if(this.searchText !== "" || textSearch) {
--       // if(this.searchText !== this.prevSearchText) {
--          this.clearResults();
--          this.prevSearchText = this.searchText;
--          this.fetchWikiSearch().then(results => {
--            console.log('results', results);
--            //this.resultsCache = results;
--            if(this.hasActiveFilters()) {
--              this.fetchFilterSearch().then(this.filterResults);
--            } else {
--              this.results = results ? results : [];
--            }
--          })
--        /*} else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) {
--          this.fetchFilterSearch().then(this.filterResults)
--        } else {
--          this.results = this.resultsCache;
--        }
--        */
--      } else {
--        this.clearResults();
--        console.log("no search text, should return filter search results if any");
--        this.fetchFilterSearch().then(collabs => {
--          console.log("Format and display collabs", collabs);
--        })
--      }
--    }
--    hasActiveFilters() {
--      // we only look at role filters for POC.
--      return this.rolesFilter.length > 0;
--    }
--    fetchWikiSearch() {
--      // request should be built from component, not from "external" dependency. Leave it here like this for POC.
--      return handleXWikiSearch(this.searchText, this.offset, this.nb);
--    }
--    fetchFilterSearch() {
--      return new Promise((resolve) => {
--        if(this.hasActiveFilters()) {
--          fetch(this.filterUrl).then(res => res.json()).then((res) => resolve(res));
--        } else {
--          resolve([]);
--        }
--      });
--    }
--    filterResults = (filteredCollabs) => {
--      const collabSpaces = filteredCollabs.map(collab => `Collabs.${collab.name}`);
--      this.results = this.resultsCache.filter(result => collabSpaces.some(space => result.space.startsWith(space)));
--    }
--    clearResults() {
--      this.results = [];
--      this.resultsCache = [];
--    }
--    getLink(xwikiDocSpace) {
--      return `/bin/view/${xwikiDocSpace.replaceAll('.', '/')}`;
--    }
--    handleKeyPress(e) {
--      if (e.keyCode === 13) {
--        this.handleSearch(true);
--      }
--    }
--    render() {
--      return html`
--<div>
--  <div>
--    <input id="searchInput" @change="${this.setSearchText}" type="text" placeholder="Search..." @keypress="${this.handleKeyPress}" />
--    <input @change="${this.setNb}"" type="text" value="${this.nb}" />
--    <input @change="${this.setOffset}"" type="text" value="${this.offset}" />
--    <button @click="${() => this.handleSearch(true)}">Search</button>
--  </div>
--  <div>
--    <label><input type="checkbox" @change="${() => this.toggleRoleFilter('administrator')}" .checked="${this.administratorFilter}"/> Administrator</label>
--    <label><input type="checkbox" @change="${() => this.toggleRoleFilter('editor')}" .checked="${this.editorFilter}"/> Editor</label>
--    <label><input type="checkbox" @change="${() => this.toggleRoleFilter('viewer')}" .checked="${this.viewerFilter}"/> Viewer</label>
--  </div>
--  <div>
--    ${this.results.map(result => html`
--        <div class="result">
--          <a href="${this.getLink(result.space)}">${result.title_}</a>
--          <div>${result.doccontent_.substring(0, 150)}
--          <div class="light">${result.space.replaceAll('.', ' / ')}</div>
--        </div>
--    `)}
--  </div>
--`
--    }
++<pre id="context-search-response"></pre>
++<script>
++  /*
++  async function fetchGlobalSearch(term) {
++    const res = await fetch(`/rest/wikis/query?q=${term}&media=json`)
++    const json = await res.json();
++    return JSON.stringify(json, null, 2);
    }
--  customElements.define('clb-unified-search', UnifiedSearch);
++  async function fetchCurrentCollabSearch(term) {
++    const res = await fetch(`/rest/wikis/xwiki/spaces/Collabs/spaces/bougaultx/search?q=${term}&media=json`)
++    const json = await res.json();
++    return JSON.stringify(json, null, 2);
++  }
++  window.addEventListener('DOMContentLoaded', function() {
++    const contextSearchType = document.getElementById("context-search-type");
++    const contextSearchText = document.getElementById("context-search-text");
++    const contextSearchResponse = document.getElementById("context-search-response");
++    const contextSearchButton = document.getElementById("context-search-button");
++    contextSearchButton.addEventListener('click', function() {
++      const context = contextSearchType.options[contextSearchType.selectedIndex].value;
++      const term = contextSearchText.value;
++      switch(context) {
++          case 'collabs':
++            document.location.href = `/bin/view/Collabs/#search=${term}`;
++            break;
++          case 'current-collab':
++            fetchCurrentCollabSearch(term).then(results => contextSearchResponse.innerText = results);
++            break
++          default:
++            fetchGlobalSearch(term).then(results => contextSearchResponse.innerText = results);
++      }
--  function handleXWikiSearch(searchString, offset, nb) {
--    return new Promise((resolve) => {
--      require(['jquery'], function($) {
--        const solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get');
--        //contextSearchButton.addEventListener('click', function() {
--          $.get(solrServiceURL, {
--            outputSyntax: 'plain',
--            media: 'json',
--            nb: nb,
--            offset: offset,
--            query: [
--              'q="__INPUT__"~100',
--              'fq=type:DOCUMENT',
--              `fq=space:Collabs.*`
--            ].join('\n'),
--            input: searchString
--          }).then(resolve);
--        //});
--      });
      });
--  }
++  });
++*/
++const solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get');
++console.log('xxxxx', solrServiceURL);
++
++require(['jquery'], function($) {
++  console.log('ZZZZ');
++  var solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get');
++  const contextSearchButton = document.getElementById("context-search-button");
++  contextSearchButton.addEventListener('click', function() {
++    $.post(solrServiceURL, {
++      outputSyntax: 'plain',
++      media: 'json',
++      query: [
++        'q=*__INPUT__*',
++        'fq=type:DOCUMENT',
++        'fq=class:XWiki.XWikiUsers',
++        'qf=property.XWiki.XWikiUsers.last_name^10 property.XWiki.XWikiUsers.first_name^5 name^2.5'
++      ].join('\n'),
++      input: $('#context-search-text').val()
++    });
++  });
  });
  </script>
--<clb-unified-search></clb-unified-search>{{/html}}
++{{/html}}