Changes for page Context Search

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

From 12.1 to 11.1 From 26.31 to 26.30

From version 26.30

edited by bougault
on 2022/11/16 15:24

Change comment: There is no comment for this version

To version 12.1

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

Change comment: There is no comment for this version

Raw
Rendered

Summary

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

Details

Page properties

Content

@@ -5,48 +5,23 @@
    <option value="collabs">Collabs</option>
    <option value="current-collab">Current Collab</option>
  </select>
--<div>
--<label>
--  <input type="checkbox" data-role-filter="administrator"> Administrator
--</label>
  <input type="text" id="context-search-text" />
  <button id="context-search-button" class="btn btn-primary">Search</button>
  <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);
++  }
++  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 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);
--      }
--    }
--
--    function removeRole(role) {
--      filters.roles.filter(r => r !== 'administrator')
--    }
--
--    document.querySelector('checkbox[data-role-filter]').forEach(function(filter) {
--      filter.addEventListener('click', {
--        const role = this.getAttribute('data-role-filter');
--        if(this.checked) {
--          addRole(role);
--        } else {
--          removeRole(role);
--        }
--        console.log(filters);
--      })
--    });
--
--    // 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");
@@ -59,55 +59,35 @@
              document.location.href = `/bin/view/Collabs/#search=${term}`;
              break;
            case 'current-collab':
--            handleXWikiSearch('bougaultx');
++            fetchCurrentCollabSearch(term).then(results => contextSearchResponse.innerText = results);
              break
            default:
--            handleXWikiSearch('', applyAdministratorFilter)
++            fetchGlobalSearch(term).then(results => contextSearchResponse.innerText = results);
        }
      });
--    function handleXWikiSearch(space, callback) {
--      require(['jquery'], 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${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);
--          })
++  });
++*/
++  console.log('hello world');
++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=space:Collabs.the-collaboratory'
++      ].join('\n'),
++      input: $('#context-search-text').val()
++    });
++  });
  });
--
--
  </script>
  {{/html}}