@blaze-cms/plugin-search-ui 0.130.0-project-admin-customisations.0 → 0.130.0

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

@@ -1,30 +1,24 @@
 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 [{
     loading,
     results,
     total
   }, setQueryParams] = useSearchResults({
-    queryKey: SEARCH_ADMIN,
-    entities: debouncedEntityValues.map(e => e.id)
+    queryKey: SEARCH_ADMIN
   });
   useEffect(() => {
     if (searchInputRef && searchInputRef.current) {
@@ -78,38 +72,17 @@ const SearchAdmin = () => {
   const searchModalResultsClassName = classnames('modal modal--full-screen modal--search', {
     '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) {
-      setEntityValues(entityValues.filter(entity => entity.id !== newEntity.id));
-    } else {
-      setEntityValues([...entityValues, newEntity]);
-    }
-  };
+  const showResults = enableResults && results.length;
   return /*#__PURE__*/React.createElement("div", {
     className: "search search--header"
   }, /*#__PURE__*/React.createElement(TriggerModal, {
     toggleSearchModal: toggleSearchModal
   }), /*#__PURE__*/React.createElement("div", {
     className: searchModalResultsClassName
-  }, displaySearchModalFrame && /*#__PURE__*/React.createElement("div", {
-    className: "modal__search"
-  }, /*#__PURE__*/React.createElement(SearchAdminSideBar, {
-    searchModalSideBarClassName: searchModalSideBarClassName,
-    openSearchSideBar: openSearchSideBar,
-    setOpenSearchSideBar: setOpenSearchSideBar,
-    handleSetEntityValues: handleSetEntityValues,
-    entityValues: entityValues,
-    setEntityValues: setEntityValues
-  }), /*#__PURE__*/React.createElement("div", {
-    className: "modal__search__content"
-  }, /*#__PURE__*/React.createElement("div", {
+  }, displaySearchModalFrame && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     className: "modal__header modal__header--search"
   }, /*#__PURE__*/React.createElement(SearchBar, {
     toggleSearchModal: toggleSearchModal,
@@ -120,11 +93,15 @@ const SearchAdmin = () => {
     search: () => search({
       value: searchTerm
     })
-  })), shouldDisplayRecentSearches && /*#__PURE__*/React.createElement(RecentSearches, {
+  })), shouldDisplayRecentSearches ? /*#__PURE__*/React.createElement(RecentSearches, {
     recentSearches: recentSearches,
     handleSearchTerm: handleSearchTerm,
     search: search
-  }), enableResults && /*#__PURE__*/React.createElement(SearchResults, {
+  }) : /*#__PURE__*/React.createElement(React.Fragment, null, !showResults && /*#__PURE__*/React.createElement("div", {
+    className: "list list--search"
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "header header--list"
+  }, /*#__PURE__*/React.createElement("h2", null, "No Results")))), showResults && /*#__PURE__*/React.createElement(SearchResults, {
     currentValue: searchTerm,
     searchTerm: searchTerm,
     loading: loading,
@@ -132,7 +109,7 @@ const SearchAdmin = () => {
     total: total,
     setQueryParams: setQueryParams,
     closeModal: toggleSearchModal
-  })))));
+  }))));
 };
 export default SearchAdmin;
 //# sourceMappingURL=SearchAdmin.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"SearchAdmin.js","names":["React","useState","useRef","useEffect","classnames","useDebounce","useLocalStorage","SearchBar","RecentSearches","SearchResults","TriggerModal","SearchAdminSideBar","useSearchResults","SEARCH_ADMIN","SearchAdmin","searchTerm","setSearchTerm","openSearchSideBar","setOpenSearchSideBar","entityValues","setEntityValues","recentSearches","setRecentSearches","displaySearchModalFrame","setDisplaySearchModalFrame","enableResults","setEnableResults","searchInputRef","debouncedEntityValues","loading","results","total","setQueryParams","queryKey","entities","map","e","id","current","focus","handleSearchTerm","target","value","toggleSearchModal","search","MAX_RECENT_SEARCHES","recentSearchesCopy","slice","includes","push","length","shift","handleKeyDown","key","clear","searchModalResultsClassName","searchModalSideBarClassName","isEmptySearchTermAndData","isEmptySearchTermnAndDisabledResults","shouldDisplayRecentSearches","handleSetEntityValues","newEntity","entityExists","some","entity","filter","createElement","className","currentValue","closeModal"],"sources":["../../../src/components/SearchAdmin/SearchAdmin.js"],"sourcesContent":["import React, { useState, useRef, useEffect } from 'react';\nimport classnames from 'classnames';\nimport { useDebounce } from '@blaze-react/utils/lib/customHooks';\nimport useLocalStorage from '../useLocalStorage';\nimport SearchBar from './SearchBar';\nimport RecentSearches from './RecentSearches';\nimport SearchResults from './SearchResults';\nimport TriggerModal from './TriggerModal';\nimport SearchAdminSideBar from './SearchAdminSideBar';\nimport useSearchResults from '../useSearchResults';\nimport { SEARCH_ADMIN } from '../../constants';\n\nconst SearchAdmin = () => {\n  const [searchTerm, setSearchTerm] = useState('');\n  const [openSearchSideBar, setOpenSearchSideBar] = useState(true);\n  const [entityValues, setEntityValues] = useState([]);\n\n  const [recentSearches, setRecentSearches] = useLocalStorage('recentSearches', []);\n  const [displaySearchModalFrame, setDisplaySearchModalFrame] = useState(false);\n  const [enableResults, setEnableResults] = useState(true);\n  const searchInputRef = useRef(null);\n  const debouncedEntityValues = useDebounce(entityValues, 500);\n  const [{ loading, results, total }, setQueryParams] = useSearchResults({\n    queryKey: SEARCH_ADMIN,\n    entities: debouncedEntityValues.map(e => e.id)\n  });\n\n  useEffect(\n    () => {\n      if (searchInputRef && searchInputRef.current) {\n        searchInputRef.current.focus();\n      }\n    },\n    [displaySearchModalFrame]\n  );\n\n  const handleSearchTerm = ({ target: { value } }) => {\n    setSearchTerm(value);\n  };\n\n  const toggleSearchModal = () => {\n    setSearchTerm(null);\n    setEnableResults(false);\n    setDisplaySearchModalFrame(!displaySearchModalFrame);\n  };\n\n  const search = ({ value }) => {\n    if (!value) return;\n    !enableResults && setEnableResults(true);\n    const MAX_RECENT_SEARCHES = 5;\n    const recentSearchesCopy = recentSearches.slice();\n\n    if (!recentSearchesCopy.includes(value)) {\n      recentSearchesCopy.push(value);\n      if (recentSearchesCopy.length > MAX_RECENT_SEARCHES) {\n        recentSearchesCopy.shift();\n      }\n    }\n\n    setRecentSearches(recentSearchesCopy);\n    setQueryParams({ value });\n  };\n\n  const handleKeyDown = ({ key }) => {\n    if (key === 'Enter') {\n      if (!searchTerm) return clear();\n      search({ value: searchTerm });\n    }\n  };\n\n  const clear = () => {\n    setSearchTerm('');\n    setEnableResults(false);\n  };\n\n  const searchModalResultsClassName = classnames('modal modal--full-screen modal--search', {\n    'modal--show': displaySearchModalFrame\n  });\n\n  const searchModalSideBarClassName = classnames('modal__search__sidebar', {\n    'modal__search__sidebar--close': !openSearchSideBar\n  });\n\n  const isEmptySearchTermAndData = !searchTerm && !results.length;\n  const isEmptySearchTermnAndDisabledResults = !searchTerm && !enableResults;\n  const shouldDisplayRecentSearches =\n    isEmptySearchTermAndData || isEmptySearchTermnAndDisabledResults;\n\n  const handleSetEntityValues = newEntity => {\n    const entityExists = entityValues.some(entity => entity.id === newEntity.id);\n    if (entityExists) {\n      setEntityValues(entityValues.filter(entity => entity.id !== newEntity.id));\n    } else {\n      setEntityValues([...entityValues, newEntity]);\n    }\n  };\n\n  return (\n    <div className=\"search search--header\">\n      <TriggerModal toggleSearchModal={toggleSearchModal} />\n      <div className={searchModalResultsClassName}>\n        {displaySearchModalFrame && (\n          <div className=\"modal__search\">\n            <SearchAdminSideBar\n              searchModalSideBarClassName={searchModalSideBarClassName}\n              openSearchSideBar={openSearchSideBar}\n              setOpenSearchSideBar={setOpenSearchSideBar}\n              handleSetEntityValues={handleSetEntityValues}\n              entityValues={entityValues}\n              setEntityValues={setEntityValues}\n            />\n            <div className=\"modal__search__content\">\n              <div className=\"modal__header modal__header--search\">\n                <SearchBar\n                  toggleSearchModal={toggleSearchModal}\n                  handleKeyDown={handleKeyDown}\n                  searchInputRef={searchInputRef}\n                  handleSearchTerm={handleSearchTerm}\n                  searchTerm={searchTerm}\n                  search={() => search({ value: searchTerm })}\n                />\n              </div>\n              {shouldDisplayRecentSearches && (\n                <RecentSearches\n                  recentSearches={recentSearches}\n                  handleSearchTerm={handleSearchTerm}\n                  search={search}\n                />\n              )}\n              {enableResults && (\n                <SearchResults\n                  currentValue={searchTerm}\n                  searchTerm={searchTerm}\n                  loading={loading}\n                  results={results}\n                  total={total}\n                  setQueryParams={setQueryParams}\n                  closeModal={toggleSearchModal}\n                />\n              )}\n            </div>\n          </div>\n        )}\n      </div>\n    </div>\n  );\n};\n\nexport default SearchAdmin;\n"],"mappings":"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"}
+{"version":3,"file":"SearchAdmin.js","names":["React","useState","useRef","useEffect","classnames","useLocalStorage","SearchBar","RecentSearches","SearchResults","TriggerModal","useSearchResults","SEARCH_ADMIN","SearchAdmin","searchTerm","setSearchTerm","recentSearches","setRecentSearches","displaySearchModalFrame","setDisplaySearchModalFrame","enableResults","setEnableResults","searchInputRef","loading","results","total","setQueryParams","queryKey","current","focus","handleSearchTerm","target","value","toggleSearchModal","search","MAX_RECENT_SEARCHES","recentSearchesCopy","slice","includes","push","length","shift","handleKeyDown","key","clear","searchModalResultsClassName","isEmptySearchTermAndData","isEmptySearchTermnAndDisabledResults","shouldDisplayRecentSearches","showResults","createElement","className","Fragment","currentValue","closeModal"],"sources":["../../../src/components/SearchAdmin/SearchAdmin.js"],"sourcesContent":["import React, { useState, useRef, useEffect } from 'react';\nimport classnames from 'classnames';\nimport useLocalStorage from '../useLocalStorage';\nimport SearchBar from './SearchBar';\nimport RecentSearches from './RecentSearches';\nimport SearchResults from './SearchResults';\nimport TriggerModal from './TriggerModal';\nimport useSearchResults from '../useSearchResults';\nimport { SEARCH_ADMIN } from '../../constants';\n\nconst SearchAdmin = () => {\n  const [searchTerm, setSearchTerm] = useState('');\n  const [recentSearches, setRecentSearches] = useLocalStorage('recentSearches', []);\n  const [displaySearchModalFrame, setDisplaySearchModalFrame] = useState(false);\n  const [enableResults, setEnableResults] = useState(true);\n  const searchInputRef = useRef(null);\n  const [{ loading, results, total }, setQueryParams] = useSearchResults({\n    queryKey: SEARCH_ADMIN\n  });\n\n  useEffect(\n    () => {\n      if (searchInputRef && searchInputRef.current) {\n        searchInputRef.current.focus();\n      }\n    },\n    [displaySearchModalFrame]\n  );\n\n  const handleSearchTerm = ({ target: { value } }) => {\n    setSearchTerm(value);\n  };\n  const toggleSearchModal = () => {\n    setSearchTerm(null);\n    setEnableResults(false);\n    setDisplaySearchModalFrame(!displaySearchModalFrame);\n  };\n  const search = ({ value }) => {\n    if (!value) return;\n    !enableResults && setEnableResults(true);\n    const MAX_RECENT_SEARCHES = 5;\n    const recentSearchesCopy = recentSearches.slice();\n\n    if (!recentSearchesCopy.includes(value)) {\n      recentSearchesCopy.push(value);\n      if (recentSearchesCopy.length > MAX_RECENT_SEARCHES) {\n        recentSearchesCopy.shift();\n      }\n    }\n\n    setRecentSearches(recentSearchesCopy);\n    setQueryParams({ value });\n  };\n\n  const handleKeyDown = ({ key }) => {\n    if (key === 'Enter') {\n      if (!searchTerm) return clear();\n      search({ value: searchTerm });\n    }\n  };\n\n  const clear = () => {\n    setSearchTerm('');\n    setEnableResults(false);\n  };\n\n  const searchModalResultsClassName = classnames('modal modal--full-screen modal--search', {\n    'modal--show': displaySearchModalFrame\n  });\n\n  const isEmptySearchTermAndData = !searchTerm && !results.length;\n  const isEmptySearchTermnAndDisabledResults = !searchTerm && !enableResults;\n  const shouldDisplayRecentSearches =\n    isEmptySearchTermAndData || isEmptySearchTermnAndDisabledResults;\n\n  const showResults = enableResults && results.length;\n\n  return (\n    <div className=\"search search--header\">\n      <TriggerModal toggleSearchModal={toggleSearchModal} />\n      <div className={searchModalResultsClassName}>\n        {displaySearchModalFrame && (\n          <>\n            <div className=\"modal__header modal__header--search\">\n              <SearchBar\n                toggleSearchModal={toggleSearchModal}\n                handleKeyDown={handleKeyDown}\n                searchInputRef={searchInputRef}\n                handleSearchTerm={handleSearchTerm}\n                searchTerm={searchTerm}\n                search={() => search({ value: searchTerm })}\n              />\n            </div>\n            {shouldDisplayRecentSearches ? (\n              <RecentSearches\n                recentSearches={recentSearches}\n                handleSearchTerm={handleSearchTerm}\n                search={search}\n              />\n            ) : (\n              <>\n                {!showResults && (\n                  <div className=\"list list--search\">\n                    <div className=\"header header--list\">\n                      <h2>No Results</h2>\n                    </div>\n                  </div>\n                )}\n              </>\n            )}\n            {showResults && (\n              <SearchResults\n                currentValue={searchTerm}\n                searchTerm={searchTerm}\n                loading={loading}\n                results={results}\n                total={total}\n                setQueryParams={setQueryParams}\n                closeModal={toggleSearchModal}\n              />\n            )}\n          </>\n        )}\n      </div>\n    </div>\n  );\n};\n\nexport default SearchAdmin;\n"],"mappings":"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"}

package/lib-es/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';
@@ -16,16 +16,6 @@ const SearchResults = ({
 }) => {
   const [verifiedRanges, setVerifiedRanges] = useState([]);
   const [currentIndex, setCurrentIndex] = useState(0);
-  const [currentResults, setCurrentResults] = useState([]);
-  const [currentTotal, setCurrentTotal] = useState(0);
-  useEffect(() => {
-    if (!loading) {
-      const [lowestRange] = verifiedRanges;
-      setCurrentTotal(total);
-      setCurrentResults(results);
-      if (lowestRange > results.length) setVerifiedRanges([]);
-    }
-  }, [loading, results, total, verifiedRanges]);
   const handleRenderedItems = async ({
     startIndex
   }) => {
@@ -61,21 +51,14 @@ const SearchResults = ({
     const year = String(newDate.getYear()).slice(-2);
     return `${day}.${month}.${year}`;
   };
-  if (!currentResults.length) return /*#__PURE__*/React.createElement("div", {
-    className: "list list--search"
-  }, /*#__PURE__*/React.createElement("div", {
-    className: "header header--list"
-  }, /*#__PURE__*/React.createElement("h2", null, "No Results")));
-  return /*#__PURE__*/React.createElement("div", {
+  return /*#__PURE__*/React.createElement(React.Fragment, null, loading && /*#__PURE__*/React.createElement("span", null, "Loading..."), /*#__PURE__*/React.createElement("div", {
     className: "modal__content modal__content--search"
   }, /*#__PURE__*/React.createElement("div", {
     className: "header header--list"
-  }, /*#__PURE__*/React.createElement("h2", {
-    className: "header--list--results"
-  }, "About ", /*#__PURE__*/React.createElement("b", null, currentTotal), " search keywords results")), /*#__PURE__*/React.createElement(VirtualList, {
+  }, /*#__PURE__*/React.createElement("h2", null, total, " results")), /*#__PURE__*/React.createElement(VirtualList, {
     width: "100%",
     height: window.innerHeight - SEARCH_RESULTS_ELEMETS_HEIGHT_ABOVE_LIST,
-    itemCount: currentResults.length,
+    itemCount: results.length,
     itemSize: SEARCH_RESULTS_ITEM_SIZE,
     overscanCount: SEARCH_RESULTS_OVER_SCAN_BUFFER,
     scrollToIndex: currentIndex,
@@ -88,15 +71,9 @@ const SearchResults = ({
         id,
         docType,
         updated,
-        name,
-        entityIdentifier,
-        published,
-        created,
-        status
-      } = currentResults[index];
+        name
+      } = results[index];
       const updatedDate = updated ? getDateFormat(updated) : null;
-      const createdDate = created ? getDateFormat(created) : null;
-      const publishedDate = published ? getDateFormat(published) : null;
       return /*#__PURE__*/React.createElement("div", {
         key: index,
         style: style,
@@ -106,8 +83,8 @@ const SearchResults = ({
       }, /*#__PURE__*/React.createElement("div", {
         className: "list__item-row list__item-row--result"
       }, /*#__PURE__*/React.createElement("span", {
-        className: "list__item-identifier"
-      }, entityIdentifier), /*#__PURE__*/React.createElement("a", {
+        className: "badge badge--primary"
+      }, docType, " ", updatedDate), /*#__PURE__*/React.createElement("a", {
         href: getNavigationRoute({
           id,
           docType
@@ -116,14 +93,10 @@ const SearchResults = ({
           id,
           docType
         }),
-        className: "list__item-link"
-      }, name), /*#__PURE__*/React.createElement("div", {
-        className: "list__item-dates"
-      }, publishedDate && /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement("b", null, "Published: "), publishedDate), /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement("b", null, "Created: "), createdDate), /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement("b", null, "Updated: "), updatedDate)), /*#__PURE__*/React.createElement("div", {
-        className: "list__item-status"
-      }, status && /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement("b", null, "Status: "), status)))));
+        className: "list__item-text list__item-text--result"
+      }, name))));
     }
-  }), loading && /*#__PURE__*/React.createElement("span", null, "Loading..."));
+  })));
 };
 SearchResults.propTypes = {
   loading: PropTypes.bool.isRequired,

package/lib-es/components/SearchAdmin/SearchResults/SearchResults.js.map

@@ -1 +1 @@
-{"version":3,"file":"SearchResults.js","names":["React","useState","useEffect","PropTypes","VirtualList","withRouter","SEARCH_RESULTS_OVER_SCAN_BUFFER","SEARCH_RESULTS_ELEMETS_HEIGHT_ABOVE_LIST","SEARCH_RESULTS_ITEM_SIZE","FILE","SearchResults","currentValue","loading","results","total","setQueryParams","closeModal","history","verifiedRanges","setVerifiedRanges","currentIndex","setCurrentIndex","currentResults","setCurrentResults","currentTotal","setCurrentTotal","lowestRange","length","handleRenderedItems","startIndex","rowsLength","loadIndex","Math","floor","includes","value","offset","getNavigationRoute","id","docType","navigate","push","getDateFormat","date","newDate","Date","day","getDate","slice","month","getMonth","year","String","getYear","createElement","className","width","height","window","innerHeight","itemCount","itemSize","overscanCount","scrollToIndex","onItemsRendered","renderItem","index","style","updated","name","entityIdentifier","published","created","status","updatedDate","createdDate","publishedDate","key","href","onClick","propTypes","bool","isRequired","array","number","func","object","string"],"sources":["../../../../src/components/SearchAdmin/SearchResults/SearchResults.js"],"sourcesContent":["/* eslint-disable jsx-a11y/anchor-is-valid */\n/* eslint-disable jsx-a11y/no-static-element-interactions */\nimport React, { useState, useEffect } from 'react';\nimport PropTypes from 'prop-types';\nimport VirtualList from 'react-tiny-virtual-list';\nimport { withRouter } from 'react-router-dom';\nimport {\n  SEARCH_RESULTS_OVER_SCAN_BUFFER,\n  SEARCH_RESULTS_ELEMETS_HEIGHT_ABOVE_LIST,\n  SEARCH_RESULTS_ITEM_SIZE,\n  FILE\n} from '../../../constants';\n\nconst SearchResults = ({\n  currentValue,\n  loading,\n  results,\n  total,\n  setQueryParams,\n  closeModal,\n  history\n}) => {\n  const [verifiedRanges, setVerifiedRanges] = useState([]);\n  const [currentIndex, setCurrentIndex] = useState(0);\n  const [currentResults, setCurrentResults] = useState([]);\n  const [currentTotal, setCurrentTotal] = useState(0);\n\n  useEffect(\n    () => {\n      if (!loading) {\n        const [lowestRange] = verifiedRanges;\n        setCurrentTotal(total);\n        setCurrentResults(results);\n        if (lowestRange > results.length) setVerifiedRanges([]);\n      }\n    },\n    [loading, results, total, verifiedRanges]\n  );\n\n  const handleRenderedItems = async ({ startIndex }) => {\n    const rowsLength = results.length;\n    const loadIndex = Math.floor(rowsLength / 2) - SEARCH_RESULTS_OVER_SCAN_BUFFER;\n    if (loadIndex > 0 && loadIndex < startIndex && !verifiedRanges.includes(loadIndex)) {\n      setQueryParams({ value: currentValue, offset: results.length });\n      setVerifiedRanges([...verifiedRanges, loadIndex]);\n      setCurrentIndex(startIndex + SEARCH_RESULTS_OVER_SCAN_BUFFER);\n    }\n  };\n\n  const getNavigationRoute = ({ id, docType }) =>\n    docType === FILE ? `/media/edit/${id}` : `/data-listing/${docType}/update/${id}`;\n\n  const navigate = ({ id, docType }) => {\n    history.push(getNavigationRoute({ id, docType }));\n    closeModal();\n  };\n\n  const getDateFormat = date => {\n    const newDate = new Date(date);\n    const day = `0${newDate.getDate()}`.slice(-2);\n    const month = `0${newDate.getMonth() + 1}`.slice(-2);\n    const year = String(newDate.getYear()).slice(-2);\n    return `${day}.${month}.${year}`;\n  };\n\n  if (!currentResults.length)\n    return (\n      <div className=\"list list--search\">\n        <div className=\"header header--list\">\n          <h2>No Results</h2>\n        </div>\n      </div>\n    );\n\n  return (\n    <div className=\"modal__content modal__content--search\">\n      <div className=\"header header--list\">\n        <h2 className=\"header--list--results\">\n          About <b>{currentTotal}</b> search keywords results\n        </h2>\n      </div>\n      <VirtualList\n        width=\"100%\"\n        height={window.innerHeight - SEARCH_RESULTS_ELEMETS_HEIGHT_ABOVE_LIST}\n        itemCount={currentResults.length}\n        itemSize={SEARCH_RESULTS_ITEM_SIZE}\n        overscanCount={SEARCH_RESULTS_OVER_SCAN_BUFFER}\n        scrollToIndex={currentIndex}\n        onItemsRendered={handleRenderedItems}\n        renderItem={({ index, style }) => {\n          const {\n            id,\n            docType,\n            updated,\n            name,\n            entityIdentifier,\n            published,\n            created,\n            status\n          } = currentResults[index];\n          const updatedDate = updated ? getDateFormat(updated) : null;\n          const createdDate = created ? getDateFormat(created) : null;\n          const publishedDate = published ? getDateFormat(published) : null;\n          return (\n            <div key={index} style={style} className=\"list__item--resultWrapper\">\n              <div className=\"list__item list__item--result\">\n                <div className=\"list__item-row list__item-row--result\">\n                  <span className=\"list__item-identifier\">{entityIdentifier}</span>\n                  <a\n                    href={getNavigationRoute({\n                      id,\n                      docType\n                    })}\n                    onClick={() =>\n                      navigate({\n                        id,\n                        docType\n                      })\n                    }\n                    className=\"list__item-link\">\n                    {name}\n                  </a>\n\n                  <div className=\"list__item-dates\">\n                    {publishedDate && (\n                      <span>\n                        <b>Published: </b>\n                        {publishedDate}\n                      </span>\n                    )}\n                    <span>\n                      <b>Created: </b>\n                      {createdDate}\n                    </span>\n                    <span>\n                      <b>Updated: </b>\n                      {updatedDate}\n                    </span>\n                  </div>\n                  <div className=\"list__item-status\">\n                    {status && (\n                      <span>\n                        <b>Status: </b>\n                        {status}\n                      </span>\n                    )}\n                  </div>\n                </div>\n              </div>\n            </div>\n          );\n        }}\n      />\n      {loading && <span>Loading...</span>}\n    </div>\n  );\n};\n\nSearchResults.propTypes = {\n  loading: PropTypes.bool.isRequired,\n  results: PropTypes.array.isRequired,\n  total: PropTypes.number.isRequired,\n  setQueryParams: PropTypes.func.isRequired,\n  closeModal: PropTypes.func.isRequired,\n  history: PropTypes.object.isRequired,\n  currentValue: PropTypes.string.isRequired\n};\n\nexport default withRouter(SearchResults);\n"],"mappings":"AAAA;AACA;AACA,OAAOA,KAAK,IAAIC,QAAQ,EAAEC,SAAS,QAAQ,OAAO;AAClD,OAAOC,SAAS,MAAM,YAAY;AAClC,OAAOC,WAAW,MAAM,yBAAyB;AACjD,SAASC,UAAU,QAAQ,kBAAkB;AAC7C,SACEC,+BAA+B,EAC/BC,wCAAwC,EACxCC,wBAAwB,EACxBC,IAAI,QACC,oBAAoB;AAE3B,MAAMC,aAAa,GAAGA,CAAC;EACrBC,YAAY;EACZC,OAAO;EACPC,OAAO;EACPC,KAAK;EACLC,cAAc;EACdC,UAAU;EACVC;AACF,CAAC,KAAK;EACJ,MAAM,CAACC,cAAc,EAAEC,iBAAiB,CAAC,GAAGlB,QAAQ,CAAC,EAAE,CAAC;EACxD,MAAM,CAACmB,YAAY,EAAEC,eAAe,CAAC,GAAGpB,QAAQ,CAAC,CAAC,CAAC;EACnD,MAAM,CAACqB,cAAc,EAAEC,iBAAiB,CAAC,GAAGtB,QAAQ,CAAC,EAAE,CAAC;EACxD,MAAM,CAACuB,YAAY,EAAEC,eAAe,CAAC,GAAGxB,QAAQ,CAAC,CAAC,CAAC;EAEnDC,SAAS,CACP,MAAM;IACJ,IAAI,CAACU,OAAO,EAAE;MACZ,MAAM,CAACc,WAAW,CAAC,GAAGR,cAAc;MACpCO,eAAe,CAACX,KAAK,CAAC;MACtBS,iBAAiB,CAACV,OAAO,CAAC;MAC1B,IAAIa,WAAW,GAAGb,OAAO,CAACc,MAAM,EAAER,iBAAiB,CAAC,EAAE,CAAC;IACzD;EACF,CAAC,EACD,CAACP,OAAO,EAAEC,OAAO,EAAEC,KAAK,EAAEI,cAAc,CAC1C,CAAC;EAED,MAAMU,mBAAmB,GAAG,MAAAA,CAAO;IAAEC;EAAW,CAAC,KAAK;IACpD,MAAMC,UAAU,GAAGjB,OAAO,CAACc,MAAM;IACjC,MAAMI,SAAS,GAAGC,IAAI,CAACC,KAAK,CAACH,UAAU,GAAG,CAAC,CAAC,GAAGxB,+BAA+B;IAC9E,IAAIyB,SAAS,GAAG,CAAC,IAAIA,SAAS,GAAGF,UAAU,IAAI,CAACX,cAAc,CAACgB,QAAQ,CAACH,SAAS,CAAC,EAAE;MAClFhB,cAAc,CAAC;QAAEoB,KAAK,EAAExB,YAAY;QAAEyB,MAAM,EAAEvB,OAAO,CAACc;MAAO,CAAC,CAAC;MAC/DR,iBAAiB,CAAC,CAAC,GAAGD,cAAc,EAAEa,SAAS,CAAC,CAAC;MACjDV,eAAe,CAACQ,UAAU,GAAGvB,+BAA+B,CAAC;IAC/D;EACF,CAAC;EAED,MAAM+B,kBAAkB,GAAGA,CAAC;IAAEC,EAAE;IAAEC;EAAQ,CAAC,KACzCA,OAAO,KAAK9B,IAAI,GAAI,eAAc6B,EAAG,EAAC,GAAI,iBAAgBC,OAAQ,WAAUD,EAAG,EAAC;EAElF,MAAME,QAAQ,GAAGA,CAAC;IAAEF,EAAE;IAAEC;EAAQ,CAAC,KAAK;IACpCtB,OAAO,CAACwB,IAAI,CAACJ,kBAAkB,CAAC;MAAEC,EAAE;MAAEC;IAAQ,CAAC,CAAC,CAAC;IACjDvB,UAAU,CAAC,CAAC;EACd,CAAC;EAED,MAAM0B,aAAa,GAAGC,IAAI,IAAI;IAC5B,MAAMC,OAAO,GAAG,IAAIC,IAAI,CAACF,IAAI,CAAC;IAC9B,MAAMG,GAAG,GAAI,IAAGF,OAAO,CAACG,OAAO,CAAC,CAAE,EAAC,CAACC,KAAK,CAAC,CAAC,CAAC,CAAC;IAC7C,MAAMC,KAAK,GAAI,IAAGL,OAAO,CAACM,QAAQ,CAAC,CAAC,GAAG,CAAE,EAAC,CAACF,KAAK,CAAC,CAAC,CAAC,CAAC;IACpD,MAAMG,IAAI,GAAGC,MAAM,CAACR,OAAO,CAACS,OAAO,CAAC,CAAC,CAAC,CAACL,KAAK,CAAC,CAAC,CAAC,CAAC;IAChD,OAAQ,GAAEF,GAAI,IAAGG,KAAM,IAAGE,IAAK,EAAC;EAClC,CAAC;EAED,IAAI,CAAC7B,cAAc,CAACK,MAAM,EACxB,oBACE3B,KAAA,CAAAsD,aAAA;IAAKC,SAAS,EAAC;EAAmB,gBAChCvD,KAAA,CAAAsD,aAAA;IAAKC,SAAS,EAAC;EAAqB,gBAClCvD,KAAA,CAAAsD,aAAA,aAAI,YAAc,CACf,CACF,CAAC;EAGV,oBACEtD,KAAA,CAAAsD,aAAA;IAAKC,SAAS,EAAC;EAAuC,gBACpDvD,KAAA,CAAAsD,aAAA;IAAKC,SAAS,EAAC;EAAqB,gBAClCvD,KAAA,CAAAsD,aAAA;IAAIC,SAAS,EAAC;EAAuB,GAAC,QAC9B,eAAAvD,KAAA,CAAAsD,aAAA,YAAI9B,YAAgB,CAAC,4BACzB,CACD,CAAC,eACNxB,KAAA,CAAAsD,aAAA,CAAClD,WAAW;IACVoD,KAAK,EAAC,MAAM;IACZC,MAAM,EAAEC,MAAM,CAACC,WAAW,GAAGpD,wCAAyC;IACtEqD,SAAS,EAAEtC,cAAc,CAACK,MAAO;IACjCkC,QAAQ,EAAErD,wBAAyB;IACnCsD,aAAa,EAAExD,+BAAgC;IAC/CyD,aAAa,EAAE3C,YAAa;IAC5B4C,eAAe,EAAEpC,mBAAoB;IACrCqC,UAAU,EAAEA,CAAC;MAAEC,KAAK;MAAEC;IAAM,CAAC,KAAK;MAChC,MAAM;QACJ7B,EAAE;QACFC,OAAO;QACP6B,OAAO;QACPC,IAAI;QACJC,gBAAgB;QAChBC,SAAS;QACTC,OAAO;QACPC;MACF,CAAC,GAAGnD,cAAc,CAAC4C,KAAK,CAAC;MACzB,MAAMQ,WAAW,GAAGN,OAAO,GAAG1B,aAAa,CAAC0B,OAAO,CAAC,GAAG,IAAI;MAC3D,MAAMO,WAAW,GAAGH,OAAO,GAAG9B,aAAa,CAAC8B,OAAO,CAAC,GAAG,IAAI;MAC3D,MAAMI,aAAa,GAAGL,SAAS,GAAG7B,aAAa,CAAC6B,SAAS,CAAC,GAAG,IAAI;MACjE,oBACEvE,KAAA,CAAAsD,aAAA;QAAKuB,GAAG,EAAEX,KAAM;QAACC,KAAK,EAAEA,KAAM;QAACZ,SAAS,EAAC;MAA2B,gBAClEvD,KAAA,CAAAsD,aAAA;QAAKC,SAAS,EAAC;MAA+B,gBAC5CvD,KAAA,CAAAsD,aAAA;QAAKC,SAAS,EAAC;MAAuC,gBACpDvD,KAAA,CAAAsD,aAAA;QAAMC,SAAS,EAAC;MAAuB,GAAEe,gBAAuB,CAAC,eACjEtE,KAAA,CAAAsD,aAAA;QACEwB,IAAI,EAAEzC,kBAAkB,CAAC;UACvBC,EAAE;UACFC;QACF,CAAC,CAAE;QACHwC,OAAO,EAAEA,CAAA,KACPvC,QAAQ,CAAC;UACPF,EAAE;UACFC;QACF,CAAC,CACF;QACDgB,SAAS,EAAC;MAAiB,GAC1Bc,IACA,CAAC,eAEJrE,KAAA,CAAAsD,aAAA;QAAKC,SAAS,EAAC;MAAkB,GAC9BqB,aAAa,iBACZ5E,KAAA,CAAAsD,aAAA,4BACEtD,KAAA,CAAAsD,aAAA,YAAG,aAAc,CAAC,EACjBsB,aACG,CACP,eACD5E,KAAA,CAAAsD,aAAA,4BACEtD,KAAA,CAAAsD,aAAA,YAAG,WAAY,CAAC,EACfqB,WACG,CAAC,eACP3E,KAAA,CAAAsD,aAAA,4BACEtD,KAAA,CAAAsD,aAAA,YAAG,WAAY,CAAC,EACfoB,WACG,CACH,CAAC,eACN1E,KAAA,CAAAsD,aAAA;QAAKC,SAAS,EAAC;MAAmB,GAC/BkB,MAAM,iBACLzE,KAAA,CAAAsD,aAAA,4BACEtD,KAAA,CAAAsD,aAAA,YAAG,UAAW,CAAC,EACdmB,MACG,CAEL,CACF,CACF,CACF,CAAC;IAEV;EAAE,CACH,CAAC,EACD7D,OAAO,iBAAIZ,KAAA,CAAAsD,aAAA,eAAM,YAAgB,CAC/B,CAAC;AAEV,CAAC;AAED5C,aAAa,CAACsE,SAAS,GAAG;EACxBpE,OAAO,EAAET,SAAS,CAAC8E,IAAI,CAACC,UAAU;EAClCrE,OAAO,EAAEV,SAAS,CAACgF,KAAK,CAACD,UAAU;EACnCpE,KAAK,EAAEX,SAAS,CAACiF,MAAM,CAACF,UAAU;EAClCnE,cAAc,EAAEZ,SAAS,CAACkF,IAAI,CAACH,UAAU;EACzClE,UAAU,EAAEb,SAAS,CAACkF,IAAI,CAACH,UAAU;EACrCjE,OAAO,EAAEd,SAAS,CAACmF,MAAM,CAACJ,UAAU;EACpCvE,YAAY,EAAER,SAAS,CAACoF,MAAM,CAACL;AACjC,CAAC;AAED,eAAe7E,UAAU,CAACK,aAAa,CAAC"}
+{"version":3,"file":"SearchResults.js","names":["React","useState","PropTypes","VirtualList","withRouter","SEARCH_RESULTS_OVER_SCAN_BUFFER","SEARCH_RESULTS_ELEMETS_HEIGHT_ABOVE_LIST","SEARCH_RESULTS_ITEM_SIZE","FILE","SearchResults","currentValue","loading","results","total","setQueryParams","closeModal","history","verifiedRanges","setVerifiedRanges","currentIndex","setCurrentIndex","handleRenderedItems","startIndex","rowsLength","length","loadIndex","Math","floor","includes","value","offset","getNavigationRoute","id","docType","navigate","push","getDateFormat","date","newDate","Date","day","getDate","slice","month","getMonth","year","String","getYear","createElement","Fragment","className","width","height","window","innerHeight","itemCount","itemSize","overscanCount","scrollToIndex","onItemsRendered","renderItem","index","style","updated","name","updatedDate","key","href","onClick","propTypes","bool","isRequired","array","number","func","object","string"],"sources":["../../../../src/components/SearchAdmin/SearchResults/SearchResults.js"],"sourcesContent":["/* eslint-disable jsx-a11y/anchor-is-valid */\n/* eslint-disable jsx-a11y/no-static-element-interactions */\nimport React, { useState } from 'react';\nimport PropTypes from 'prop-types';\nimport VirtualList from 'react-tiny-virtual-list';\nimport { withRouter } from 'react-router-dom';\nimport {\n  SEARCH_RESULTS_OVER_SCAN_BUFFER,\n  SEARCH_RESULTS_ELEMETS_HEIGHT_ABOVE_LIST,\n  SEARCH_RESULTS_ITEM_SIZE,\n  FILE\n} from '../../../constants';\n\nconst SearchResults = ({\n  currentValue,\n  loading,\n  results,\n  total,\n  setQueryParams,\n  closeModal,\n  history\n}) => {\n  const [verifiedRanges, setVerifiedRanges] = useState([]);\n  const [currentIndex, setCurrentIndex] = useState(0);\n\n  const handleRenderedItems = async ({ startIndex }) => {\n    const rowsLength = results.length;\n    const loadIndex = Math.floor(rowsLength / 2) - SEARCH_RESULTS_OVER_SCAN_BUFFER;\n    if (loadIndex > 0 && loadIndex < startIndex && !verifiedRanges.includes(loadIndex)) {\n      setQueryParams({ value: currentValue, offset: results.length });\n      setVerifiedRanges([...verifiedRanges, loadIndex]);\n      setCurrentIndex(startIndex + SEARCH_RESULTS_OVER_SCAN_BUFFER);\n    }\n  };\n\n  const getNavigationRoute = ({ id, docType }) =>\n    docType === FILE ? `/media/edit/${id}` : `/data-listing/${docType}/update/${id}`;\n\n  const navigate = ({ id, docType }) => {\n    history.push(getNavigationRoute({ id, docType }));\n    closeModal();\n  };\n\n  const getDateFormat = date => {\n    const newDate = new Date(date);\n    const day = `0${newDate.getDate()}`.slice(-2);\n    const month = `0${newDate.getMonth() + 1}`.slice(-2);\n    const year = String(newDate.getYear()).slice(-2);\n    return `${day}.${month}.${year}`;\n  };\n\n  return (\n    <>\n      {loading && <span>Loading...</span>}\n      <div className=\"modal__content modal__content--search\">\n        <div className=\"header header--list\">\n          <h2>{total} results</h2>\n        </div>\n        <VirtualList\n          width=\"100%\"\n          height={window.innerHeight - SEARCH_RESULTS_ELEMETS_HEIGHT_ABOVE_LIST}\n          itemCount={results.length}\n          itemSize={SEARCH_RESULTS_ITEM_SIZE}\n          overscanCount={SEARCH_RESULTS_OVER_SCAN_BUFFER}\n          scrollToIndex={currentIndex}\n          onItemsRendered={handleRenderedItems}\n          renderItem={({ index, style }) => {\n            const { id, docType, updated, name } = results[index];\n            const updatedDate = updated ? getDateFormat(updated) : null;\n            return (\n              <div key={index} style={style} className=\"list__item--resultWrapper\">\n                <div className=\"list__item list__item--result\">\n                  <div className=\"list__item-row list__item-row--result\">\n                    <span className=\"badge badge--primary\">\n                      {docType} {updatedDate}\n                    </span>\n                    <a\n                      href={getNavigationRoute({\n                        id,\n                        docType\n                      })}\n                      onClick={() =>\n                        navigate({\n                          id,\n                          docType\n                        })\n                      }\n                      className=\"list__item-text list__item-text--result\">\n                      {name}\n                    </a>\n                  </div>\n                </div>\n              </div>\n            );\n          }}\n        />\n      </div>\n    </>\n  );\n};\n\nSearchResults.propTypes = {\n  loading: PropTypes.bool.isRequired,\n  results: PropTypes.array.isRequired,\n  total: PropTypes.number.isRequired,\n  setQueryParams: PropTypes.func.isRequired,\n  closeModal: PropTypes.func.isRequired,\n  history: PropTypes.object.isRequired,\n  currentValue: PropTypes.string.isRequired\n};\n\nexport default withRouter(SearchResults);\n"],"mappings":"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"}

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

@@ -16,7 +16,6 @@ function useSearch({
     value: ''
   });
   const [searchedValue, setSearchedValue] = useState(null);
-  const [previousEntities, setPreviousEntities] = useState([]);
   const [previousOffset, setPreviousOffset] = useState(null);
   const buildSearchQuery = searchQueries[queryKey];
   const [getSearchResults, {
@@ -52,13 +51,12 @@ function useSearch({
     } = 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,
@@ -85,9 +83,8 @@ function useSearch({
       });
       setSearchedValue(value);
       setPreviousOffset(offset);
-      setPreviousEntities(entities);
     }
-  }, [queryParams, queryParams.limit, queryParams.value, queryParams.offset, searchedValue, previousOffset, getSearchResults, entities, fields, entities.length, previousEntities.length]);
+  }, [queryParams, queryParams.limit, queryParams.value, queryParams.offset, searchedValue, previousOffset, getSearchResults, entities, fields]);
   return [{
     searchedValue: queryParams.value,
     loading,

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

@@ -1 +1 @@
-{"version":3,"file":"useSearch.js","names":["useState","useEffect","useLazyQuery","searchQueries","useSearch","queryKey","resultKeys","entities","fields","queryParams","setParams","limit","offset","value","searchedValue","setSearchedValue","previousEntities","setPreviousEntities","previousOffset","setPreviousOffset","buildSearchQuery","getSearchResults","loading","data","search","results","jsonResults","total","ssr","handleQueryParams","newQueryParams","_objectSpread","isNewValueSet","isNewOffsetSet","notSameLength","length","parsedEntities","map","entity","match","docType","variables","rawQuery","query","bool","must","query_string","type","default_operator","should"],"sources":["../../../src/components/useSearch/useSearch.js"],"sourcesContent":["import { useState, useEffect } from 'react';\nimport { useLazyQuery } from '@apollo/client';\nimport searchQueries from '../../application/query';\n\nfunction useSearch({ queryKey, resultKeys, entities = [], fields }) {\n  const [queryParams, setParams] = useState({ limit: 20, offset: 0, value: '' });\n  const [searchedValue, setSearchedValue] = useState(null);\n  const [previousEntities, setPreviousEntities] = useState([]);\n  const [previousOffset, setPreviousOffset] = useState(null);\n  const buildSearchQuery = searchQueries[queryKey];\n\n  const [\n    getSearchResults,\n    {\n      loading,\n      data: { search: { results, jsonResults, total } } = {\n        search: { results: [], total: 0 }\n      }\n    }\n  ] = useLazyQuery(buildSearchQuery({ resultKeys }), { ssr: false });\n  // todo: remove ssr: false once this bug is resolved https://github.com/apollographql/apollo-client/issues/9108\n  // without ssr: false clients can hang in ssr.\n\n  const handleQueryParams = newQueryParams => {\n    setParams({ ...queryParams, ...newQueryParams });\n  };\n\n  useEffect(\n    () => {\n      const { limit, offset, value } = queryParams;\n      const isNewValueSet = value && value !== searchedValue;\n      const isNewOffsetSet = previousOffset !== null && offset !== previousOffset;\n      const notSameLength = previousEntities.length !== entities.length;\n      const parsedEntities = entities.length\n        ? entities.map(entity => ({\n            match: { docType: entity }\n          }))\n        : [];\n\n      if (isNewValueSet || isNewOffsetSet || notSameLength) {\n        getSearchResults({\n          variables: {\n            limit,\n            offset,\n            rawQuery: {\n              query: {\n                bool: {\n                  must: [\n                    {\n                      query_string: {\n                        query: value,\n                        fields,\n                        type: 'most_fields',\n                        default_operator: 'AND'\n                      }\n                    },\n                    {\n                      bool: {\n                        should: parsedEntities\n                      }\n                    }\n                  ]\n                }\n              }\n            }\n          }\n        });\n        setSearchedValue(value);\n        setPreviousOffset(offset);\n        setPreviousEntities(entities);\n      }\n    },\n    [\n      queryParams,\n      queryParams.limit,\n      queryParams.value,\n      queryParams.offset,\n      searchedValue,\n      previousOffset,\n      getSearchResults,\n      entities,\n      fields,\n      entities.length,\n      previousEntities.length\n    ]\n  );\n\n  return [\n    { searchedValue: queryParams.value, loading, data: { results: results || jsonResults, total } },\n    handleQueryParams\n  ];\n}\n\nexport default useSearch;\n"],"mappings":";;;AAAA,SAASA,QAAQ,EAAEC,SAAS,QAAQ,OAAO;AAC3C,SAASC,YAAY,QAAQ,gBAAgB;AAC7C,OAAOC,aAAa,MAAM,yBAAyB;AAEnD,SAASC,SAASA,CAAC;EAAEC,QAAQ;EAAEC,UAAU;EAAEC,QAAQ,GAAG,EAAE;EAAEC;AAAO,CAAC,EAAE;EAClE,MAAM,CAACC,WAAW,EAAEC,SAAS,CAAC,GAAGV,QAAQ,CAAC;IAAEW,KAAK,EAAE,EAAE;IAAEC,MAAM,EAAE,CAAC;IAAEC,KAAK,EAAE;EAAG,CAAC,CAAC;EAC9E,MAAM,CAACC,aAAa,EAAEC,gBAAgB,CAAC,GAAGf,QAAQ,CAAC,IAAI,CAAC;EACxD,MAAM,CAACgB,gBAAgB,EAAEC,mBAAmB,CAAC,GAAGjB,QAAQ,CAAC,EAAE,CAAC;EAC5D,MAAM,CAACkB,cAAc,EAAEC,iBAAiB,CAAC,GAAGnB,QAAQ,CAAC,IAAI,CAAC;EAC1D,MAAMoB,gBAAgB,GAAGjB,aAAa,CAACE,QAAQ,CAAC;EAEhD,MAAM,CACJgB,gBAAgB,EAChB;IACEC,OAAO;IACPC,IAAI,EAAE;MAAEC,MAAM,EAAE;QAAEC,OAAO;QAAEC,WAAW;QAAEC;MAAM;IAAE,CAAC,GAAG;MAClDH,MAAM,EAAE;QAAEC,OAAO,EAAE,EAAE;QAAEE,KAAK,EAAE;MAAE;IAClC;EACF,CAAC,CACF,GAAGzB,YAAY,CAACkB,gBAAgB,CAAC;IAAEd;EAAW,CAAC,CAAC,EAAE;IAAEsB,GAAG,EAAE;EAAM,CAAC,CAAC;EAClE;EACA;;EAEA,MAAMC,iBAAiB,GAAGC,cAAc,IAAI;IAC1CpB,SAAS,CAAAqB,aAAA,CAAAA,aAAA,KAAMtB,WAAW,GAAKqB,cAAc,CAAE,CAAC;EAClD,CAAC;EAED7B,SAAS,CACP,MAAM;IACJ,MAAM;MAAEU,KAAK;MAAEC,MAAM;MAAEC;IAAM,CAAC,GAAGJ,WAAW;IAC5C,MAAMuB,aAAa,GAAGnB,KAAK,IAAIA,KAAK,KAAKC,aAAa;IACtD,MAAMmB,cAAc,GAAGf,cAAc,KAAK,IAAI,IAAIN,MAAM,KAAKM,cAAc;IAC3E,MAAMgB,aAAa,GAAGlB,gBAAgB,CAACmB,MAAM,KAAK5B,QAAQ,CAAC4B,MAAM;IACjE,MAAMC,cAAc,GAAG7B,QAAQ,CAAC4B,MAAM,GAClC5B,QAAQ,CAAC8B,GAAG,CAACC,MAAM,KAAK;MACtBC,KAAK,EAAE;QAAEC,OAAO,EAAEF;MAAO;IAC3B,CAAC,CAAC,CAAC,GACH,EAAE;IAEN,IAAIN,aAAa,IAAIC,cAAc,IAAIC,aAAa,EAAE;MACpDb,gBAAgB,CAAC;QACfoB,SAAS,EAAE;UACT9B,KAAK;UACLC,MAAM;UACN8B,QAAQ,EAAE;YACRC,KAAK,EAAE;cACLC,IAAI,EAAE;gBACJC,IAAI,EAAE,CACJ;kBACEC,YAAY,EAAE;oBACZH,KAAK,EAAE9B,KAAK;oBACZL,MAAM;oBACNuC,IAAI,EAAE,aAAa;oBACnBC,gBAAgB,EAAE;kBACpB;gBACF,CAAC,EACD;kBACEJ,IAAI,EAAE;oBACJK,MAAM,EAAEb;kBACV;gBACF,CAAC;cAEL;YACF;UACF;QACF;MACF,CAAC,CAAC;MACFrB,gBAAgB,CAACF,KAAK,CAAC;MACvBM,iBAAiB,CAACP,MAAM,CAAC;MACzBK,mBAAmB,CAACV,QAAQ,CAAC;IAC/B;EACF,CAAC,EACD,CACEE,WAAW,EACXA,WAAW,CAACE,KAAK,EACjBF,WAAW,CAACI,KAAK,EACjBJ,WAAW,CAACG,MAAM,EAClBE,aAAa,EACbI,cAAc,EACdG,gBAAgB,EAChBd,QAAQ,EACRC,MAAM,EACND,QAAQ,CAAC4B,MAAM,EACfnB,gBAAgB,CAACmB,MAAM,CAE3B,CAAC;EAED,OAAO,CACL;IAAErB,aAAa,EAAEL,WAAW,CAACI,KAAK;IAAES,OAAO;IAAEC,IAAI,EAAE;MAAEE,OAAO,EAAEA,OAAO,IAAIC,WAAW;MAAEC;IAAM;EAAE,CAAC,EAC/FE,iBAAiB,CAClB;AACH;AAEA,eAAezB,SAAS"}
+{"version":3,"file":"useSearch.js","names":["useState","useEffect","useLazyQuery","searchQueries","useSearch","queryKey","resultKeys","entities","fields","queryParams","setParams","limit","offset","value","searchedValue","setSearchedValue","previousOffset","setPreviousOffset","buildSearchQuery","getSearchResults","loading","data","search","results","jsonResults","total","ssr","handleQueryParams","newQueryParams","_objectSpread","isNewValueSet","isNewOffsetSet","parsedEntities","length","map","entity","match","docType","variables","rawQuery","query","bool","must","query_string","type","default_operator","should"],"sources":["../../../src/components/useSearch/useSearch.js"],"sourcesContent":["import { useState, useEffect } from 'react';\nimport { useLazyQuery } from '@apollo/client';\nimport searchQueries from '../../application/query';\n\nfunction useSearch({ queryKey, resultKeys, entities = [], fields }) {\n  const [queryParams, setParams] = useState({ limit: 20, offset: 0, value: '' });\n  const [searchedValue, setSearchedValue] = useState(null);\n  const [previousOffset, setPreviousOffset] = useState(null);\n  const buildSearchQuery = searchQueries[queryKey];\n  const [\n    getSearchResults,\n    {\n      loading,\n      data: { search: { results, jsonResults, total } } = {\n        search: { results: [], total: 0 }\n      }\n    }\n  ] = useLazyQuery(buildSearchQuery({ resultKeys }), { ssr: false });\n  // todo: remove ssr: false once this bug is resolved https://github.com/apollographql/apollo-client/issues/9108\n  // without ssr: false clients can hang in ssr.\n\n  const handleQueryParams = newQueryParams => {\n    setParams({ ...queryParams, ...newQueryParams });\n  };\n\n  useEffect(\n    () => {\n      const { limit, offset, value } = queryParams;\n      const isNewValueSet = value && value !== searchedValue;\n      const isNewOffsetSet = previousOffset !== null && offset !== previousOffset;\n      const parsedEntities = entities.length\n        ? entities.map(entity => ({\n            match: { docType: entity }\n          }))\n        : [];\n\n      if (isNewValueSet || isNewOffsetSet) {\n        getSearchResults({\n          variables: {\n            limit,\n            offset,\n            rawQuery: {\n              query: {\n                bool: {\n                  must: [\n                    {\n                      query_string: {\n                        query: value,\n                        fields,\n                        type: 'most_fields',\n                        default_operator: 'AND'\n                      }\n                    },\n                    {\n                      bool: {\n                        should: parsedEntities\n                      }\n                    }\n                  ]\n                }\n              }\n            }\n          }\n        });\n        setSearchedValue(value);\n        setPreviousOffset(offset);\n      }\n    },\n    [\n      queryParams,\n      queryParams.limit,\n      queryParams.value,\n      queryParams.offset,\n      searchedValue,\n      previousOffset,\n      getSearchResults,\n      entities,\n      fields\n    ]\n  );\n\n  return [\n    { searchedValue: queryParams.value, loading, data: { results: results || jsonResults, total } },\n    handleQueryParams\n  ];\n}\n\nexport default useSearch;\n"],"mappings":"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"}

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

@@ -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), {}, {

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"],"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  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,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;EACD,OAAO,CAAC;IAAEP,OAAO;IAAEE,OAAO,EAAEL,UAAU;IAAEM;EAAM,CAAC,EAAEO,cAAc,CAAC;AAClE;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.130.0-project-admin-customisations.0",
+  "version": "0.130.0",
   "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.130.0-project-admin-customisations.0",
-    "@blaze-cms/core-errors": "0.129.0-project-admin-customisations.3",
-    "@blaze-cms/setup-ui": "0.129.0-project-admin-customisations.3",
+    "@blaze-cms/admin-ui-utils": "^0.130.0",
+    "@blaze-cms/core-errors": "^0.127.0",
+    "@blaze-cms/setup-ui": "^0.128.1",
     "@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.130.0-project-admin-customisations.0"
+    "@blaze-cms/core-ui": "^0.130.0"
   },
   "peerDependencies": {
     "@apollo/client": "3.x",
@@ -52,5 +52,5 @@
     "lib/*",
     "lib-es/*"
   ],
-  "gitHead": "f7b80031a95d3ce85f39e7a500be3de2c4e960da"
+  "gitHead": "70dd8290d605424ca430ff533d9db9124975957f"
 }

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 [{ loading, results, total }, setQueryParams] = useSearchResults({
-    queryKey: SEARCH_ADMIN,
-    entities: debouncedEntityValues.map(e => e.id)
+    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,69 +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) {
-      setEntityValues(entityValues.filter(entity => entity.id !== newEntity.id));
-    } else {
-      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}
-                  searchTerm={searchTerm}
-                  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>