Changes for page Context Search

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

From 27.3 to 27.2 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 27.3

edited by bougault
on 2022/11/17 12:51

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,7 +1,6 @@
  {{html clean="false"}}
  <!--
--  !!! POC. Code must be reviewed / optimized and packaged for use in production  !!!
--  !!! Many optimisations can be done                                             !!!
++  !!! POC. Code must be reviewed / optimized and packaged for use in production !!!
  -->
  <script type="module">
  import {LitElement, html, css} from 'https://cdn.jsdelivr.net/gh/lit/dist@2/core/lit-core.min.js';
@@ -8,15 +8,21 @@
  window.addEventListener('DOMContentLoaded', function() {
    class UnifiedSearch extends LitElement {
++    /*
      static properties = {
--      results: { type: Array },
--      resultsCache: { type: Array },
--      collabFiltersResults: { type: Array}
++      searchText: { type: String },
++      favoritesFilter: { type: Boolean },
++      administratorFilter: { type: Boolean },
++      editorFilter: { type: Boolean },
++      viewerFilter: { type: Boolean },
++      publicFilter: { type: Boolean },
++      privateFilter: { type: Boolean },
      }
++    */
++    static properties = {
++      results: { type: Array }
++    }
      static styles = css`
--      :host > div {
--        padding-bottom: 4em;
--      }
        .result {
          margin-top: 1em;
        }
@@ -27,114 +27,51 @@
        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.filterUrl = new URL(`${document.location.origin}/rest/v1/collabs?search=&offset=0&orderField=title&order=asc&favorite=&roles=`);
        this.results = [];
--      this.resultsCache = [];
--      this.collabFiltersResults = [];
      }
--    firstUpdated() {
--      this.renderRoot.getElementById('searchInput').focus();
--    }
      toggleRoleFilter(roleName) {
--      if(this.rolesFilter.indexOf(roleName) === -1) {
++      if(this.rolesFilter.indexOf(roleName) == -1) {
          this.rolesFilter.push(roleName);
        } else {
--        this.rolesFilter = this.rolesFilter.filter(role => role !== roleName);
++        this.rolesFilter.filter(role => role !== roleName);
        }
        this[roleName] = !this[roleName];
        this.filterUrl.searchParams.set('roles', this.rolesFilter.join("+"));
--      this.handleSearch();
++      console.log(this.filterUrl.toString());
      }
      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)
--        } 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);
--        })
++    handleSearch() {
++      console.log(this.searchText);
++      if(this.searchText !== "") {
++       this.fetchWikiSearch();
        }
      }
--    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);
++      handleXWikiSearch(this.searchText).then(results => this.results = results);
      }
--    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);
--      }
--    }
      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>
++    <input @change="${this.setSearchText}" type="text" placeholder="Search..." />
++    <button @click="${this.handleSearch}">Search</button>
    </div>
    <div>
      <label><input type="checkbox" @change="${() => this.toggleRoleFilter('administrator')}" .checked="${this.administratorFilter}"/> Administrator</label>
@@ -150,16 +150,6 @@
          </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>
  `
      }
@@ -187,5 +187,7 @@
    }
  });
  </script>
++
  <clb-unified-search></clb-unified-search>
++
  {{/html}}