Changes for page Context Search

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

From 26.46 to 26.45 From 27.79 to 27.78

From version 27.78

edited by bougault
on 2022/11/17 14:58

Change comment: There is no comment for this version

To version 26.46

edited by bougault
on 2022/11/17 09:27

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,191 +1,143 @@
  {{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() {
--
++  import {LitElement, html} from 'https://cdn.jsdelivr.net/gh/lit/dist@2/core/lit-core.min.js';
    class UnifiedSearch extends LitElement {
--    static properties = {
--      results: { type: Array },
--      resultsCache: { type: Array },
--      collabFiltersResults: { type: Array}
++    render() {
++      return html`<div>
++  <input type="text" placeholder="Search..." />
++  <button>Search</button>
++</div>`
      }
--    static styles = css`
--      :host > div {
--        padding-bottom: 4em;
++  }
++  customElements.define('clb-unified-search', UnifiedSearch);
++</script>
++
++<clb-unified-search></clb-unified-search>
++
++<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>
++<div class="form-group">
++  <label>
++    <input type="checkbox" data-role-filter="administrator"> Administrator
++  </label>
++  <label>
++    <input type="checkbox" data-role-filter="editor"> Editor
++  </label>
++</div>
++
++
++<pre id="context-search-response"></pre>
++<script>
++  window.addEventListener('DOMContentLoaded', function() {
++    const filters = {
++      search: '',
++      offset: 0,
++      orderField: 'title',
++      order: 'asc',
++      favorite: false,
++      roles: [] // to be joined as administrator+editor+viewer
++    };
++
++    function addRole(role) {
++      if(filters.roles.indexOf(role) == -1) {
++        filters.roles.push(role);
        }
--      .result {
--        margin-top: 1em;
--      }
--      .light {
--        color: var(--color-gray-500, #CCC);
--        font-size: 14px;
--      }
--      a {
--        color: var(--color-brand-primary, blue);
--      }
--      .rawResults {
--         width: 100%;
--        display: flex;
--        font-size: 12px;
--        margin-top: 2em;
--      }
--      .rawResults ul {
--        list-style-type: none;
--        padding: 0;
--      }
--    `;
--    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.collabFiltersResults = [];
      }
--    firstUpdated() {
--      this.renderRoot.getElementById('searchInput').focus();
++
++    function removeRole(role) {
++      filters.roles = filters.roles.filter(r => r !== role)
      }
--    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;
--    }
--    handleSearch(textSearch) {
--      if(this.searchText !== "" || textSearch) {
--        if(this.searchText !== this.prevSearchText) {
--          this.clearResults();
--          this.prevSearchText = this.searchText;
--          this.fetchWikiSearch().then(results => {
--            this.resultsCache = results;
--            if(this.hasActiveFilters()) {
--              this.fetchFilterSearch().then(this.filterResults);
--            } else {
--              this.results = results;
--            }
--          })
--        } else if (this.searchText === this.prevSearchText && this.hasActiveFilters()) {
--          this.fetchFilterSearch().then(this.filterResults)
++
++    const filterInputs = document.querySelectorAll('input[data-role-filter]');
++
++    filterInputs.forEach(function(filterIpt) {
++      filterIpt.addEventListener('click', function() {
++        const role = this.getAttribute('data-role-filter');
++        if(this.checked) {
++          addRole(role);
          } else {
--          this.results = this.resultsCache;
++          removeRole(role);
          }
--      } 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);
--        })
++        runFilteredRequest();
++      })
++    });
++
++    function runFilteredRequest() {
++      const urlParams = new URLSearchParams();
++      const tmpFilters = filters;
++      tmpFilters.roles = tmpFilters.roles.join("+");
++      for(filter in tmpFilters) {
++        urlParams.set(filter, tmpFilters[filter]);
        }
++      console.log(urlParams);
      }
--    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);
--    }
--    fetchFilterSearch() {
--      return new Promise((resolve) => {
--        if(this.hasActiveFilters()) {
--          fetch(this.filterUrl).then(res => res.json()).then((res) => {
--            this.collabFiltersResults = 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);
++    // https://wiki-dev.ebrains.eu/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=false&roles=administrator
++    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':
++            handleXWikiSearch('bougaultx');
++            break
++          default:
++            handleXWikiSearch('')
        }
--    }
--    render() {
--      return html`
--<div>
--  <div>
--    <input id="searchInput" @change="${this.setSearchText}" type="text" placeholder="Search..." @keypress="${this.handleKeyPress}" />
--    <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>
--  <div class="rawResults">
--    <div>
--      <strong>XWiki Search Results</strong>
--      <ul>${this.resultsCache.map((res) => html`<li>${res.space}</li>`)}</ul>
--    </div>
--    <div>
--      <strong>Collab Search Results (Filters)</strong>
--      <ul>${this.collabFiltersResults.map((res) => html`<li>${res.name}</li>`)}</ul>
--    </div>
--  </div>
--</div>
--`
--    }
--  }
--  customElements.define('clb-unified-search', UnifiedSearch);
--  function handleXWikiSearch(searchString) {
--    return new Promise((resolve) => {
++    });
++    function handleXWikiSearch(space, callback) {
        require(['jquery'], function($) {
--        const solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get');
--        //contextSearchButton.addEventListener('click', function() {
++        var solrServiceURL = new XWiki.Document('SuggestSolrService', 'XWiki').getURL('get');
++        const contextSearchButton = document.getElementById("context-search-button");
++        const xwikiSpace = space ? `.${space}` : '';
++        contextSearchButton.addEventListener('click', function() {
            $.post(solrServiceURL, {
--            outputSyntax: 'plain',
--            media: 'json',
--            query: [
--              'q="__INPUT__"~100',
--              'fq=type:DOCUMENT',
--              `fq=space:Collabs.*`
--            ].join('\n'),
--            input: searchString
--          }).then(resolve);
--        //});
--      });
++              outputSyntax: 'plain',
++              media: 'json',
++              query: [
++                'q="__INPUT__"~100',
++                'fq=type:DOCUMENT',
++                `fq=space:Collabs${xwikiSpace}.*`
++              ].join('\n'),
++              input: $('#context-search-text').val()
++            }).then(res => {
++            if(callback) {
++              callback(res).then(results => {
++                contextSearchResponse.innerText = JSON.stringify(results, null, 2);
++              })
++            } else {
++              contextSearchResponse.innerText = JSON.stringify(res, null, 2);
++             }
++          });
++        });
      });
    }
++  function applyAdministratorFilter(results) {
++      return new Promise((resolve, reject) => {
++        //fetch("/rest/v1/collabs?roles=administrator")
++        fetch("/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=false&roles=administrator")
++          .then(res => res.json())
++          .then(collabs => {
++            const spaces = collabs.map(collab => `Collabs.${collab.name}`);
++            const filtered = results.filter(result => spaces.some(space => result.space.startsWith(space)));
++            resolve(filtered);
++          })
++
++      })
++  }
  });
++
++
  </script>
--<clb-unified-search></clb-unified-search>
  {{/html}}