@blaze-cms/plugin-search-ui 0.133.0-admin-updates.8 → 0.133.0-alpha.4

package/lib-es/components/useSearchResults/useSearchResults.js

@@ -1,6 +1,6 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 import { useState, useEffect } from 'react';
 import useSearch from '../useSearch';
 function useSearchResults({
@@ -9,8 +9,6 @@ function useSearchResults({
   entities,
   fields
 }) {
-  const [currentResults, setCurrentResults] = useState([]);
-  const [allResults, setAllResults] = useState([]);
   const [{
     searchedValue,
     loading,
@@ -24,12 +22,14 @@ function useSearchResults({
     entities,
     fields
   });
+  const [currentResults, setCurrentResults] = useState([]);
+  const [allResults, setAllResults] = useState([]);
   useEffect(() => {
     if (currentResults.length !== results.length) {
       setAllResults([...allResults, ...results]);
       setCurrentResults(results);
     }
-  }, [allResults, currentResults, results]);
+  }, [allResults, currentResults, currentResults.length, results]);
   const clearList = params => {
     setAllResults([]);
     setParams(_objectSpread(_objectSpread({}, params), {}, {
@@ -42,8 +42,6 @@ function useSearchResults({
   return [{
     loading,
     results: allResults,
-    currentResults,
-    newResults: results,
     total
   }, setQueryParams];
 }

package/lib-es/components/useSearchResults/useSearchResults.js.map

@@ -1 +1 @@
-{"version":3,"file":"useSearchResults.js","names":["useState","useEffect","useSearch","useSearchResults","queryKey","resultKeys","entities","fields","currentResults","setCurrentResults","allResults","setAllResults","searchedValue","loading","data","results","total","setParams","length","clearList","params","_objectSpread","offset","setQueryParams","value","newResults"],"sources":["../../../src/components/useSearchResults/useSearchResults.js"],"sourcesContent":["import { useState, useEffect } from 'react';\nimport useSearch from '../useSearch';\n\nfunction useSearchResults({ queryKey, resultKeys, entities, fields }) {\n  const [currentResults, setCurrentResults] = useState([]);\n  const [allResults, setAllResults] = useState([]);\n  const [\n    {\n      searchedValue,\n      loading,\n      data: { results, total }\n    },\n    setParams\n  ] = useSearch({ queryKey, resultKeys, entities, fields });\n\n  useEffect(\n    () => {\n      if (currentResults.length !== results.length) {\n        setAllResults([...allResults, ...results]);\n        setCurrentResults(results);\n      }\n    },\n    [allResults, currentResults, results]\n  );\n\n  const clearList = params => {\n    setAllResults([]);\n    setParams({ ...params, offset: 0 });\n  };\n\n  const setQueryParams = params => {\n    params.value !== searchedValue ? clearList(params) : setParams(params);\n  };\n\n  return [\n    {\n      loading,\n      results: allResults,\n      currentResults,\n      newResults: results,\n      total\n    },\n    setQueryParams\n  ];\n}\n\nexport default useSearchResults;\n"],"mappings":";;;AAAA,SAASA,QAAQ,EAAEC,SAAS,QAAQ,OAAO;AAC3C,OAAOC,SAAS,MAAM,cAAc;AAEpC,SAASC,gBAAgBA,CAAC;EAAEC,QAAQ;EAAEC,UAAU;EAAEC,QAAQ;EAAEC;AAAO,CAAC,EAAE;EACpE,MAAM,CAACC,cAAc,EAAEC,iBAAiB,CAAC,GAAGT,QAAQ,CAAC,EAAE,CAAC;EACxD,MAAM,CAACU,UAAU,EAAEC,aAAa,CAAC,GAAGX,QAAQ,CAAC,EAAE,CAAC;EAChD,MAAM,CACJ;IACEY,aAAa;IACbC,OAAO;IACPC,IAAI,EAAE;MAAEC,OAAO;MAAEC;IAAM;EACzB,CAAC,EACDC,SAAS,CACV,GAAGf,SAAS,CAAC;IAAEE,QAAQ;IAAEC,UAAU;IAAEC,QAAQ;IAAEC;EAAO,CAAC,CAAC;EAEzDN,SAAS,CACP,MAAM;IACJ,IAAIO,cAAc,CAACU,MAAM,KAAKH,OAAO,CAACG,MAAM,EAAE;MAC5CP,aAAa,CAAC,CAAC,GAAGD,UAAU,EAAE,GAAGK,OAAO,CAAC,CAAC;MAC1CN,iBAAiB,CAACM,OAAO,CAAC;IAC5B;EACF,CAAC,EACD,CAACL,UAAU,EAAEF,cAAc,EAAEO,OAAO,CACtC,CAAC;EAED,MAAMI,SAAS,GAAGC,MAAM,IAAI;IAC1BT,aAAa,CAAC,EAAE,CAAC;IACjBM,SAAS,CAAAI,aAAA,CAAAA,aAAA,KAAMD,MAAM;MAAEE,MAAM,EAAE;IAAC,EAAE,CAAC;EACrC,CAAC;EAED,MAAMC,cAAc,GAAGH,MAAM,IAAI;IAC/BA,MAAM,CAACI,KAAK,KAAKZ,aAAa,GAAGO,SAAS,CAACC,MAAM,CAAC,GAAGH,SAAS,CAACG,MAAM,CAAC;EACxE,CAAC;EAED,OAAO,CACL;IACEP,OAAO;IACPE,OAAO,EAAEL,UAAU;IACnBF,cAAc;IACdiB,UAAU,EAAEV,OAAO;IACnBC;EACF,CAAC,EACDO,cAAc,CACf;AACH;AAEA,eAAepB,gBAAgB"}
+{"version":3,"file":"useSearchResults.js","names":["useState","useEffect","useSearch","useSearchResults","queryKey","resultKeys","entities","fields","searchedValue","loading","data","results","total","setParams","currentResults","setCurrentResults","allResults","setAllResults","length","clearList","params","_objectSpread","offset","setQueryParams","value"],"sources":["../../../src/components/useSearchResults/useSearchResults.js"],"sourcesContent":["import { useState, useEffect } from 'react';\nimport useSearch from '../useSearch';\n\nfunction useSearchResults({ queryKey, resultKeys, entities, fields }) {\n  const [\n    {\n      searchedValue,\n      loading,\n      data: { results, total }\n    },\n    setParams\n  ] = useSearch({ queryKey, resultKeys, entities, fields });\n  const [currentResults, setCurrentResults] = useState([]);\n  const [allResults, setAllResults] = useState([]);\n\n  useEffect(\n    () => {\n      if (currentResults.length !== results.length) {\n        setAllResults([...allResults, ...results]);\n        setCurrentResults(results);\n      }\n    },\n    [allResults, currentResults, currentResults.length, results]\n  );\n\n  const clearList = params => {\n    setAllResults([]);\n    setParams({ ...params, offset: 0 });\n  };\n\n  const setQueryParams = params => {\n    params.value !== searchedValue ? clearList(params) : setParams(params);\n  };\n\n  return [{ loading, results: allResults, total }, setQueryParams];\n}\n\nexport default useSearchResults;\n"],"mappings":";;;AAAA,SAASA,QAAQ,EAAEC,SAAS,QAAQ,OAAO;AAC3C,OAAOC,SAAS,MAAM,cAAc;AAEpC,SAASC,gBAAgBA,CAAC;EAAEC,QAAQ;EAAEC,UAAU;EAAEC,QAAQ;EAAEC;AAAO,CAAC,EAAE;EACpE,MAAM,CACJ;IACEC,aAAa;IACbC,OAAO;IACPC,IAAI,EAAE;MAAEC,OAAO;MAAEC;IAAM;EACzB,CAAC,EACDC,SAAS,CACV,GAAGX,SAAS,CAAC;IAAEE,QAAQ;IAAEC,UAAU;IAAEC,QAAQ;IAAEC;EAAO,CAAC,CAAC;EACzD,MAAM,CAACO,cAAc,EAAEC,iBAAiB,CAAC,GAAGf,QAAQ,CAAC,EAAE,CAAC;EACxD,MAAM,CAACgB,UAAU,EAAEC,aAAa,CAAC,GAAGjB,QAAQ,CAAC,EAAE,CAAC;EAEhDC,SAAS,CACP,MAAM;IACJ,IAAIa,cAAc,CAACI,MAAM,KAAKP,OAAO,CAACO,MAAM,EAAE;MAC5CD,aAAa,CAAC,CAAC,GAAGD,UAAU,EAAE,GAAGL,OAAO,CAAC,CAAC;MAC1CI,iBAAiB,CAACJ,OAAO,CAAC;IAC5B;EACF,CAAC,EACD,CAACK,UAAU,EAAEF,cAAc,EAAEA,cAAc,CAACI,MAAM,EAAEP,OAAO,CAC7D,CAAC;EAED,MAAMQ,SAAS,GAAGC,MAAM,IAAI;IAC1BH,aAAa,CAAC,EAAE,CAAC;IACjBJ,SAAS,CAAAQ,aAAA,CAAAA,aAAA,KAAMD,MAAM;MAAEE,MAAM,EAAE;IAAC,EAAE,CAAC;EACrC,CAAC;EAED,MAAMC,cAAc,GAAGH,MAAM,IAAI;IAC/BA,MAAM,CAACI,KAAK,KAAKhB,aAAa,GAAGW,SAAS,CAACC,MAAM,CAAC,GAAGP,SAAS,CAACO,MAAM,CAAC;EACxE,CAAC;EAED,OAAO,CAAC;IAAEX,OAAO;IAAEE,OAAO,EAAEK,UAAU;IAAEJ;EAAM,CAAC,EAAEW,cAAc,CAAC;AAClE;AAEA,eAAepB,gBAAgB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blaze-cms/plugin-search-ui",
-  "version": "0.133.0-admin-updates.8",
+  "version": "0.133.0-alpha.4",
   "description": "Blaze plugin search ui",
   "main": "lib/index.js",
   "module": "lib-es/index.js",
@@ -27,9 +27,9 @@
   },
   "license": "GPL-3.0",
   "dependencies": {
-    "@blaze-cms/admin-ui-utils": "0.133.0-admin-updates.0",
-    "@blaze-cms/core-errors": "0.133.0-admin-updates.0",
-    "@blaze-cms/setup-ui": "0.133.0-admin-updates.0",
+    "@blaze-cms/admin-ui-utils": "^0.132.0",
+    "@blaze-cms/core-errors": "^0.131.0",
+    "@blaze-cms/setup-ui": "^0.131.0",
     "@blaze-react/button": "0.5.19",
     "@blaze-react/input": "0.5.30",
     "@blaze-react/utils": "0.5.15",
@@ -40,7 +40,7 @@
     "react-tiny-virtual-list": "2.2.0"
   },
   "devDependencies": {
-    "@blaze-cms/core-ui": "0.133.0-admin-updates.0"
+    "@blaze-cms/core-ui": "^0.131.0"
   },
   "peerDependencies": {
     "@apollo/client": "3.x",
@@ -52,5 +52,5 @@
     "lib/*",
     "lib-es/*"
   ],
-  "gitHead": "d658f426515fedaa18a658d427a12a2b91000287"
+  "gitHead": "9b00075ee8315f7b787ef9ac0077c496cce5983b"
 }

package/src/components/SearchAdmin/SearchAdmin.js

@@ -1,28 +1,21 @@
 import React, { useState, useRef, useEffect } from 'react';
 import classnames from 'classnames';
-import { useDebounce } from '@blaze-react/utils/lib/customHooks';
 import useLocalStorage from '../useLocalStorage';
 import SearchBar from './SearchBar';
 import RecentSearches from './RecentSearches';
 import SearchResults from './SearchResults';
 import TriggerModal from './TriggerModal';
-import SearchAdminSideBar from './SearchAdminSideBar';
 import useSearchResults from '../useSearchResults';
 import { SEARCH_ADMIN } from '../../constants';
 
 const SearchAdmin = () => {
   const [searchTerm, setSearchTerm] = useState('');
-  const [openSearchSideBar, setOpenSearchSideBar] = useState(true);
-  const [entityValues, setEntityValues] = useState([]);
   const [recentSearches, setRecentSearches] = useLocalStorage('recentSearches', []);
   const [displaySearchModalFrame, setDisplaySearchModalFrame] = useState(false);
   const [enableResults, setEnableResults] = useState(true);
   const searchInputRef = useRef(null);
-  const debouncedEntityValues = useDebounce(entityValues, 500);
-  const entities = debouncedEntityValues.map(e => e.id);
-  const [{ loading, newResults: results = [], total }, setQueryParams] = useSearchResults({
-    queryKey: SEARCH_ADMIN,
-    entities
+  const [{ loading, results, total }, setQueryParams] = useSearchResults({
+    queryKey: SEARCH_ADMIN
   });
 
   useEffect(
@@ -37,13 +30,11 @@ const SearchAdmin = () => {
   const handleSearchTerm = ({ target: { value } }) => {
     setSearchTerm(value);
   };
-
   const toggleSearchModal = () => {
     setSearchTerm(null);
     setEnableResults(false);
     setDisplaySearchModalFrame(!displaySearchModalFrame);
   };
-
   const search = ({ value }) => {
     if (!value) return;
     !enableResults && setEnableResults(true);
@@ -77,71 +68,58 @@ const SearchAdmin = () => {
     'modal--show': displaySearchModalFrame
   });
 
-  const searchModalSideBarClassName = classnames('modal__search__sidebar', {
-    'modal__search__sidebar--close': !openSearchSideBar
-  });
-
   const isEmptySearchTermAndData = !searchTerm && !results.length;
   const isEmptySearchTermnAndDisabledResults = !searchTerm && !enableResults;
   const shouldDisplayRecentSearches =
     isEmptySearchTermAndData || isEmptySearchTermnAndDisabledResults;
 
-  const handleSetEntityValues = newEntity => {
-    const entityExists = entityValues.some(entity => entity.id === newEntity.id);
-    if (entityExists) {
-      setQueryParams({ value: searchTerm, offset: 0 });
-      setEntityValues(entityValues.filter(entity => entity.id !== newEntity.id));
-    } else {
-      setQueryParams({ value: searchTerm, offset: 0 });
-      setEntityValues([...entityValues, newEntity]);
-    }
-  };
+  const showResults = enableResults && results.length;
 
   return (
     <div className="search search--header">
       <TriggerModal toggleSearchModal={toggleSearchModal} />
       <div className={searchModalResultsClassName}>
         {displaySearchModalFrame && (
-          <div className="modal__search">
-            <SearchAdminSideBar
-              searchModalSideBarClassName={searchModalSideBarClassName}
-              openSearchSideBar={openSearchSideBar}
-              setOpenSearchSideBar={setOpenSearchSideBar}
-              handleSetEntityValues={handleSetEntityValues}
-              entityValues={entityValues}
-              setEntityValues={setEntityValues}
-            />
-            <div className="modal__search__content">
-              <div className="modal__header modal__header--search">
-                <SearchBar
-                  toggleSearchModal={toggleSearchModal}
-                  handleKeyDown={handleKeyDown}
-                  searchInputRef={searchInputRef}
-                  handleSearchTerm={handleSearchTerm}
-                  searchTerm={searchTerm}
-                  search={() => search({ value: searchTerm })}
-                />
-              </div>
-              {shouldDisplayRecentSearches && (
-                <RecentSearches
-                  recentSearches={recentSearches}
-                  handleSearchTerm={handleSearchTerm}
-                  search={search}
-                />
-              )}
-              {enableResults && (
-                <SearchResults
-                  currentValue={searchTerm}
-                  entities={entities}
-                  loading={loading}
-                  results={results}
-                  total={total}
-                  setQueryParams={setQueryParams}
-                  closeModal={toggleSearchModal}
-                />
-              )}
+          <>
+            <div className="modal__header modal__header--search">
+              <SearchBar
+                toggleSearchModal={toggleSearchModal}
+                handleKeyDown={handleKeyDown}
+                searchInputRef={searchInputRef}
+                handleSearchTerm={handleSearchTerm}
+                searchTerm={searchTerm}
+                search={() => search({ value: searchTerm })}
+              />
             </div>
-          </div>
+            {shouldDisplayRecentSearches ? (
+              <RecentSearches
+                recentSearches={recentSearches}
+                handleSearchTerm={handleSearchTerm}
+                search={search}
+              />
+            ) : (
+              <>
+                {!showResults && (
+                  <div className="list list--search">
+                    <div className="header header--list">
+                      <h2>No Results</h2>
+                    </div>
+                  </div>
+                )}
+              </>
+            )}
+            {showResults && (
+              <SearchResults
+                currentValue={searchTerm}
+                searchTerm={searchTerm}
+                loading={loading}
+                results={results}
+                total={total}
+                setQueryParams={setQueryParams}
+                closeModal={toggleSearchModal}
+              />
+            )}
+          </>
         )}
       </div>
     </div>

package/src/components/SearchAdmin/SearchResults/SearchResults.js

@@ -1,6 +1,6 @@
 /* eslint-disable jsx-a11y/anchor-is-valid */
 /* eslint-disable jsx-a11y/no-static-element-interactions */
-import React, { useState, useEffect } from 'react';
+import React, { useState } from 'react';
 import PropTypes from 'prop-types';
 import VirtualList from 'react-tiny-virtual-list';
 import { withRouter } from 'react-router-dom';
@@ -13,7 +13,6 @@ import {
 
 const SearchResults = ({
   currentValue,
-  entities,
   loading,
   results,
   total,
@@ -23,45 +22,12 @@ const SearchResults = ({
 }) => {
   const [verifiedRanges, setVerifiedRanges] = useState([]);
   const [currentIndex, setCurrentIndex] = useState(0);
-  const [currentResults, setCurrentResults] = useState('');
-  const [allResults, setAllResults] = useState([]);
-  const [currentParams, setCurrentParams] = useState('');
-
-  useEffect(
-    () => {
-      if (!loading) {
-        const newResults = results.map(({ id }) => id).join(',');
-        if (currentResults !== newResults) {
-          const newParams = `${currentValue},${entities.join(',')}`;
-          if (newParams !== currentParams) {
-            setAllResults(results);
-            setCurrentParams(newParams);
-            if (verifiedRanges.length) setVerifiedRanges([]);
-          } else {
-            setAllResults(allResults.concat(results));
-          }
-          setCurrentResults(newResults);
-        }
-      }
-    },
-    [
-      allResults,
-      currentParams,
-      currentResults,
-      currentValue,
-      entities,
-      loading,
-      results,
-      total,
-      verifiedRanges.length
-    ]
-  );
 
   const handleRenderedItems = async ({ startIndex }) => {
-    const rowsLength = allResults.length;
+    const rowsLength = results.length;
     const loadIndex = Math.floor(rowsLength / 2) - SEARCH_RESULTS_OVER_SCAN_BUFFER;
     if (loadIndex > 0 && loadIndex < startIndex && !verifiedRanges.includes(loadIndex)) {
-      setQueryParams({ value: currentValue, offset: allResults.length });
+      setQueryParams({ value: currentValue, offset: results.length });
       setVerifiedRanges([...verifiedRanges, loadIndex]);
       setCurrentIndex(startIndex + SEARCH_RESULTS_OVER_SCAN_BUFFER);
     }
@@ -83,96 +49,53 @@ const SearchResults = ({
     return `${day}.${month}.${year}`;
   };
 
-  if (!allResults.length)
-    return (
-      <div className="list list--search">
+  return (
+    <>
+      {loading && <span>Loading...</span>}
+      <div className="modal__content modal__content--search">
         <div className="header header--list">
-          <h2>No Results</h2>
+          <h2>{total} results</h2>
         </div>
-      </div>
-    );
-
-  return (
-    <div className="modal__content modal__content--search">
-      <div className="header header--list">
-        <h2 className="header--list--results">
-          About <b>{total}</b> search keywords results
-        </h2>
-      </div>
-      <VirtualList
-        width="100%"
-        height={window.innerHeight - SEARCH_RESULTS_ELEMETS_HEIGHT_ABOVE_LIST}
-        itemCount={allResults.length}
-        itemSize={SEARCH_RESULTS_ITEM_SIZE}
-        overscanCount={SEARCH_RESULTS_OVER_SCAN_BUFFER}
-        scrollToIndex={currentIndex}
-        onItemsRendered={handleRenderedItems}
-        renderItem={({ index, style }) => {
-          const {
-            id,
-            docType,
-            updated,
-            name,
-            entityIdentifier,
-            published,
-            created,
-            status
-          } = allResults[index];
-          const updatedDate = updated ? getDateFormat(updated) : null;
-          const createdDate = created ? getDateFormat(created) : null;
-          const publishedDate = published ? getDateFormat(published) : null;
-          return (
-            <div key={index} style={style} className="list__item--resultWrapper">
-              <div className="list__item list__item--result">
-                <div className="list__item-row list__item-row--result">
-                  <span className="list__item-identifier">{entityIdentifier}</span>
-                  <a
-                    href={getNavigationRoute({
-                      id,
-                      docType
-                    })}
-                    onClick={() =>
-                      navigate({
+        <VirtualList
+          width="100%"
+          height={window.innerHeight - SEARCH_RESULTS_ELEMETS_HEIGHT_ABOVE_LIST}
+          itemCount={results.length}
+          itemSize={SEARCH_RESULTS_ITEM_SIZE}
+          overscanCount={SEARCH_RESULTS_OVER_SCAN_BUFFER}
+          scrollToIndex={currentIndex}
+          onItemsRendered={handleRenderedItems}
+          renderItem={({ index, style }) => {
+            const { id, docType, updated, name } = results[index];
+            const updatedDate = updated ? getDateFormat(updated) : null;
+            return (
+              <div key={index} style={style} className="list__item--resultWrapper">
+                <div className="list__item list__item--result">
+                  <div className="list__item-row list__item-row--result">
+                    <span className="badge badge--primary">
+                      {docType} {updatedDate}
+                    </span>
+                    <a
+                      href={getNavigationRoute({
                         id,
                         docType
-                      })
-                    }
-                    className="list__item-link">
-                    {name}
-                  </a>
-
-                  <div className="list__item-dates">
-                    {publishedDate && (
-                      <span>
-                        <b>Published: </b>
-                        {publishedDate}
-                      </span>
-                    )}
-                    <span>
-                      <b>Created: </b>
-                      {createdDate}
-                    </span>
-                    <span>
-                      <b>Updated: </b>
-                      {updatedDate}
-                    </span>
-                  </div>
-                  <div className="list__item-status">
-                    {status && (
-                      <span>
-                        <b>Status: </b>
-                        {status}
-                      </span>
-                    )}
+                      })}
+                      onClick={() =>
+                        navigate({
+                          id,
+                          docType
+                        })
+                      }
+                      className="list__item-text list__item-text--result">
+                      {name}
+                    </a>
                   </div>
                 </div>
               </div>
-            </div>
-          );
-        }}
-      />
-      {loading && <span>Loading...</span>}
-    </div>
+            );
+          }}
+        />
+      </div>
+    </>
   );
 };
 
@@ -183,8 +106,7 @@ SearchResults.propTypes = {
   setQueryParams: PropTypes.func.isRequired,
   closeModal: PropTypes.func.isRequired,
   history: PropTypes.object.isRequired,
-  currentValue: PropTypes.string.isRequired,
-  entities: PropTypes.array.isRequired
+  currentValue: PropTypes.string.isRequired
 };
 
 export default withRouter(SearchResults);

package/src/components/useSearch/useSearch.js

@@ -5,7 +5,6 @@ import searchQueries from '../../application/query';
 function useSearch({ queryKey, resultKeys, entities = [], fields, extraFilters }) {
   const [queryParams, setParams] = useState({ limit: 20, offset: 0, value: '' });
   const [searchedValue, setSearchedValue] = useState(null);
-  const [previousEntities, setPreviousEntities] = useState([]);
   const [previousOffset, setPreviousOffset] = useState(null);
   const buildSearchQuery = searchQueries[queryKey];
 
@@ -36,14 +35,13 @@ function useSearch({ queryKey, resultKeys, entities = [], fields, extraFilters }
       const { limit, offset, value } = queryParams;
       const isNewValueSet = value && value !== searchedValue;
       const isNewOffsetSet = previousOffset !== null && offset !== previousOffset;
-      const notSameLength = previousEntities.length !== entities.length;
       const parsedEntities = entities.length
         ? entities.map(entity => ({
             match: { docType: entity }
           }))
         : [];
 
-      if (isNewValueSet || isNewOffsetSet || notSameLength) {
+      if (isNewValueSet || isNewOffsetSet) {
         getSearchResults({
           variables: {
             limit,
@@ -74,7 +72,6 @@ function useSearch({ queryKey, resultKeys, entities = [], fields, extraFilters }
         });
         setSearchedValue(value);
         setPreviousOffset(offset);
-        setPreviousEntities(entities);
       }
     },
     [
@@ -87,8 +84,6 @@ function useSearch({ queryKey, resultKeys, entities = [], fields, extraFilters }
       getSearchResults,
       entities,
       fields,
-      entities.length,
-      previousEntities.length,
       extraFilters
     ]
   );

package/src/components/useSearchResults/useSearchResults.js

@@ -2,8 +2,6 @@ import { useState, useEffect } from 'react';
 import useSearch from '../useSearch';
 
 function useSearchResults({ queryKey, resultKeys, entities, fields }) {
-  const [currentResults, setCurrentResults] = useState([]);
-  const [allResults, setAllResults] = useState([]);
   const [
     {
       searchedValue,
@@ -12,6 +10,8 @@ function useSearchResults({ queryKey, resultKeys, entities, fields }) {
     },
     setParams
   ] = useSearch({ queryKey, resultKeys, entities, fields });
+  const [currentResults, setCurrentResults] = useState([]);
+  const [allResults, setAllResults] = useState([]);
 
   useEffect(
     () => {
@@ -20,7 +20,7 @@ function useSearchResults({ queryKey, resultKeys, entities, fields }) {
         setCurrentResults(results);
       }
     },
-    [allResults, currentResults, results]
+    [allResults, currentResults, currentResults.length, results]
   );
 
   const clearList = params => {
@@ -32,16 +32,7 @@ function useSearchResults({ queryKey, resultKeys, entities, fields }) {
     params.value !== searchedValue ? clearList(params) : setParams(params);
   };
 
-  return [
-    {
-      loading,
-      results: allResults,
-      currentResults,
-      newResults: results,
-      total
-    },
-    setQueryParams
-  ];
+  return [{ loading, results: allResults, total }, setQueryParams];
 }
 
 export default useSearchResults;

package/lib/components/SearchAdmin/SearchAdminSideBar/SearchAdminSideBar.js

@@ -1,112 +0,0 @@
-"use strict";
-
-require("core-js/modules/es.array.iterator.js");
-require("core-js/modules/es.string.iterator.js");
-require("core-js/modules/es.weak-map.js");
-require("core-js/modules/web.dom-collections.iterator.js");
-require("core-js/modules/es.object.define-property.js");
-require("core-js/modules/es.object.get-own-property-descriptor.js");
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-var _typeof = require("@babel/runtime/helpers/typeof");
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports["default"] = void 0;
-require("core-js/modules/es.array.filter.js");
-require("core-js/modules/es.object.to-string.js");
-require("core-js/modules/es.array.includes.js");
-require("core-js/modules/es.string.includes.js");
-require("core-js/modules/es.array.slice.js");
-require("core-js/modules/es.array.map.js");
-require("core-js/modules/es.array.some.js");
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-var _react = _interopRequireWildcard(require("react"));
-var _client = require("@apollo/client");
-var _adminUiUtils = require("@blaze-cms/admin-ui-utils");
-var _checkboxes = require("@blaze-react/checkboxes");
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-var MENU_PERMISSIONS = ['update:any', 'update:own', 'create:any', 'create:own'];
-var SearchAdminSideBar = function SearchAdminSideBar(_ref) {
-  var searchModalSideBarClassName = _ref.searchModalSideBarClassName,
-    openSearchSideBar = _ref.openSearchSideBar,
-    setOpenSearchSideBar = _ref.setOpenSearchSideBar,
-    handleSetEntityValues = _ref.handleSetEntityValues,
-    entityValues = _ref.entityValues,
-    setEntityValues = _ref.setEntityValues;
-  var _useState = (0, _react.useState)(false),
-    _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
-    loadMore = _useState2[0],
-    setLoadMore = _useState2[1];
-  var _useQuery = (0, _client.useQuery)((0, _adminUiUtils.getQuery)('GET_USER_EDITABLE_ENTITIES'), {
-      variables: {
-        canDoActions: MENU_PERMISSIONS
-      }
-    }),
-    _useQuery$data = _useQuery.data,
-    _useQuery$data2 = _useQuery$data === void 0 ? {} : _useQuery$data,
-    _useQuery$data2$getEn = _useQuery$data2.getEntitySchemas,
-    getEntitySchemas = _useQuery$data2$getEn === void 0 ? [] : _useQuery$data2$getEn,
-    loading = _useQuery.loading;
-  if (loading) return null;
-  var filteredEntitiesSchemas = getEntitySchemas.filter(function (entity) {
-    if (entity.extras && entity.extras.searchIndexes) {
-      return entity.extras.searchIndexes.includes('admin');
-    }
-    return false;
-  });
-  var entitiesToShow = filteredEntitiesSchemas.slice(0, loadMore ? filteredEntitiesSchemas.length : 5);
-  return /*#__PURE__*/_react["default"].createElement("div", {
-    className: searchModalSideBarClassName
-  }, /*#__PURE__*/_react["default"].createElement("div", {
-    className: "modal__search__sidebar__button",
-    role: "button",
-    onClick: function onClick() {
-      return setOpenSearchSideBar(!openSearchSideBar);
-    }
-  }, /*#__PURE__*/_react["default"].createElement("i", {
-    className: "material-icons"
-  }, openSearchSideBar ? 'keyboard_arrow_left' : 'keyboard_arrow_right')), /*#__PURE__*/_react["default"].createElement("div", {
-    className: "modal__search__sidebar__container"
-  }, /*#__PURE__*/_react["default"].createElement("div", {
-    className: "modal__search__sidebar__wrapper"
-  }, /*#__PURE__*/_react["default"].createElement("div", {
-    className: "modal__search__sidebar__filters"
-  }, /*#__PURE__*/_react["default"].createElement("i", {
-    className: "material-icons modal__search__sidebar__icon"
-  }, "tune"), /*#__PURE__*/_react["default"].createElement("span", null, "Filters")), /*#__PURE__*/_react["default"].createElement("div", {
-    className: "modal__search__sidebar__clear",
-    role: "button",
-    onClick: function onClick() {
-      return setEntityValues([]);
-    }
-  }, /*#__PURE__*/_react["default"].createElement("span", null, "Clear all"), /*#__PURE__*/_react["default"].createElement("i", {
-    className: "material-icons modal__search__sidebar__icon--clear"
-  }, "replay"))), /*#__PURE__*/_react["default"].createElement("div", {
-    className: "modal__search__sidebar__entity-list"
-  }, /*#__PURE__*/_react["default"].createElement("h1", null, "Entity list"), entitiesToShow.map(function (entity) {
-    return /*#__PURE__*/_react["default"].createElement(_checkboxes.Checkbox, {
-      checked: entityValues.some(function (_entity) {
-        return _entity.id === entity.id;
-      }),
-      label: entity.displayName,
-      id: entity.id,
-      name: entity.id,
-      onChange: function onChange(_ref2) {
-        var checked = _ref2.value.checked;
-        return handleSetEntityValues(entity);
-      }
-    });
-  }), /*#__PURE__*/_react["default"].createElement("div", {
-    className: "modal__search__sidebar__more",
-    role: "button",
-    onClick: function onClick() {
-      return setLoadMore(!loadMore);
-    }
-  }, /*#__PURE__*/_react["default"].createElement("i", {
-    className: "material-icons"
-  }, !loadMore ? 'navigate_next' : 'expand_less'), /*#__PURE__*/_react["default"].createElement("span", null, loadMore ? 'Less' : 'More')))));
-};
-var _default = SearchAdminSideBar;
-exports["default"] = _default;
-//# sourceMappingURL=SearchAdminSideBar.js.map