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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (32) hide show
  1. package/CHANGELOG.md +13 -13
  2. package/lib/components/SearchAdmin/SearchAdmin.js +12 -57
  3. package/lib/components/SearchAdmin/SearchAdmin.js.map +1 -1
  4. package/lib/components/SearchAdmin/SearchResults/SearchResults.js +6 -18
  5. package/lib/components/SearchAdmin/SearchResults/SearchResults.js.map +1 -1
  6. package/lib/components/useSearch/useSearch.js +5 -11
  7. package/lib/components/useSearch/useSearch.js.map +1 -1
  8. package/lib/components/useSearchResults/useSearchResults.js +19 -1
  9. package/lib/components/useSearchResults/useSearchResults.js.map +1 -1
  10. package/lib-es/components/SearchAdmin/SearchAdmin.js +3 -31
  11. package/lib-es/components/SearchAdmin/SearchAdmin.js.map +1 -1
  12. package/lib-es/components/SearchAdmin/SearchResults/SearchResults.js +6 -18
  13. package/lib-es/components/SearchAdmin/SearchResults/SearchResults.js.map +1 -1
  14. package/lib-es/components/useSearch/useSearch.js +2 -5
  15. package/lib-es/components/useSearch/useSearch.js.map +1 -1
  16. package/lib-es/components/useSearchResults/useSearchResults.js +11 -1
  17. package/lib-es/components/useSearchResults/useSearchResults.js.map +1 -1
  18. package/package.json +6 -6
  19. package/src/components/SearchAdmin/SearchAdmin.js +40 -70
  20. package/src/components/SearchAdmin/SearchResults/SearchResults.js +6 -42
  21. package/src/components/useSearch/useSearch.js +2 -8
  22. package/src/components/useSearchResults/useSearchResults.js +15 -1
  23. package/lib/components/SearchAdmin/SearchAdminSideBar/SearchAdminSideBar.js +0 -113
  24. package/lib/components/SearchAdmin/SearchAdminSideBar/SearchAdminSideBar.js.map +0 -1
  25. package/lib/components/SearchAdmin/SearchAdminSideBar/index.js +0 -12
  26. package/lib/components/SearchAdmin/SearchAdminSideBar/index.js.map +0 -1
  27. package/lib-es/components/SearchAdmin/SearchAdminSideBar/SearchAdminSideBar.js +0 -76
  28. package/lib-es/components/SearchAdmin/SearchAdminSideBar/SearchAdminSideBar.js.map +0 -1
  29. package/lib-es/components/SearchAdmin/SearchAdminSideBar/index.js +0 -3
  30. package/lib-es/components/SearchAdmin/SearchAdminSideBar/index.js.map +0 -1
  31. package/src/components/SearchAdmin/SearchAdminSideBar/SearchAdminSideBar.js +0 -88
  32. package/src/components/SearchAdmin/SearchAdminSideBar/index.js +0 -3
@@ -1 +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","showResults","handleSetEntityValues","newEntity","entityExists","some","entity","filter","createElement","className","Fragment","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 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 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 showResults = enableResults && results.length;\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 <>\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 </div>\n </div>\n )}\n </div>\n </div>\n );\n};\n\nexport default SearchAdmin;\n"],"mappings":"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"}
1
+ {"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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"}
@@ -55,9 +55,7 @@ const SearchResults = ({
55
55
  className: "modal__content modal__content--search"
56
56
  }, /*#__PURE__*/React.createElement("div", {
57
57
  className: "header header--list"
58
- }, /*#__PURE__*/React.createElement("h2", {
59
- className: "header--list--results"
60
- }, "About ", /*#__PURE__*/React.createElement("b", null, total), " search keywords results")), /*#__PURE__*/React.createElement(VirtualList, {
58
+ }, /*#__PURE__*/React.createElement("h2", null, total, " results")), /*#__PURE__*/React.createElement(VirtualList, {
61
59
  width: "100%",
62
60
  height: window.innerHeight - SEARCH_RESULTS_ELEMETS_HEIGHT_ABOVE_LIST,
63
61
  itemCount: results.length,
@@ -73,15 +71,9 @@ const SearchResults = ({
73
71
  id,
74
72
  docType,
75
73
  updated,
76
- name,
77
- entityIdentifier,
78
- published,
79
- created,
80
- status
74
+ name
81
75
  } = results[index];
82
76
  const updatedDate = updated ? getDateFormat(updated) : null;
83
- const createdDate = created ? getDateFormat(created) : null;
84
- const publishedDate = published ? getDateFormat(published) : null;
85
77
  return /*#__PURE__*/React.createElement("div", {
86
78
  key: index,
87
79
  style: style,
@@ -91,8 +83,8 @@ const SearchResults = ({
91
83
  }, /*#__PURE__*/React.createElement("div", {
92
84
  className: "list__item-row list__item-row--result"
93
85
  }, /*#__PURE__*/React.createElement("span", {
94
- className: "list__item-identifier"
95
- }, entityIdentifier), /*#__PURE__*/React.createElement("a", {
86
+ className: "badge badge--primary"
87
+ }, docType, " ", updatedDate), /*#__PURE__*/React.createElement("a", {
96
88
  href: getNavigationRoute({
97
89
  id,
98
90
  docType
@@ -101,12 +93,8 @@ const SearchResults = ({
101
93
  id,
102
94
  docType
103
95
  }),
104
- className: "list__item-link"
105
- }, name), /*#__PURE__*/React.createElement("div", {
106
- className: "list__item-dates"
107
- }, 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", {
108
- className: "list__item-status"
109
- }, status && /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement("b", null, "Status: "), status)))));
96
+ className: "list__item-text list__item-text--result"
97
+ }, name))));
110
98
  }
111
99
  })));
112
100
  };
@@ -1 +1 @@
1
- {"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","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 } 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 className=\"header--list--results\">\n About <b>{total}</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={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 {\n id,\n docType,\n updated,\n name,\n entityIdentifier,\n published,\n created,\n status\n } = results[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 </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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"}
1
+ {"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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"}
@@ -16,7 +16,6 @@ function useSearch({
16
16
  value: ''
17
17
  });
18
18
  const [searchedValue, setSearchedValue] = useState(null);
19
- const [en, setEn] = useState([]);
20
19
  const [previousOffset, setPreviousOffset] = useState(null);
21
20
  const buildSearchQuery = searchQueries[queryKey];
22
21
  const [getSearchResults, {
@@ -52,13 +51,12 @@ function useSearch({
52
51
  } = queryParams;
53
52
  const isNewValueSet = value && value !== searchedValue;
54
53
  const isNewOffsetSet = previousOffset !== null && offset !== previousOffset;
55
- const notSameLength = en.length !== entities.length;
56
54
  const parsedEntities = entities.length ? entities.map(entity => ({
57
55
  match: {
58
56
  docType: entity
59
57
  }
60
58
  })) : [];
61
- if (isNewValueSet || isNewOffsetSet || notSameLength) {
59
+ if (isNewValueSet || isNewOffsetSet) {
62
60
  getSearchResults({
63
61
  variables: {
64
62
  limit,
@@ -85,9 +83,8 @@ function useSearch({
85
83
  });
86
84
  setSearchedValue(value);
87
85
  setPreviousOffset(offset);
88
- setEn(entities);
89
86
  }
90
- }, [queryParams, queryParams.limit, queryParams.value, queryParams.offset, searchedValue, previousOffset, getSearchResults, entities, fields, entities.length, en.length]);
87
+ }, [queryParams, queryParams.limit, queryParams.value, queryParams.offset, searchedValue, previousOffset, getSearchResults, entities, fields]);
91
88
  return [{
92
89
  searchedValue: queryParams.value,
93
90
  loading,
@@ -1 +1 @@
1
- {"version":3,"file":"useSearch.js","names":["useState","useEffect","useLazyQuery","searchQueries","useSearch","queryKey","resultKeys","entities","fields","queryParams","setParams","limit","offset","value","searchedValue","setSearchedValue","en","setEn","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 [en, setEn] = useState([]);\n const [previousOffset, setPreviousOffset] = useState(null);\n\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 notSameLength = en.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 setEn(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 en.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":"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"}
1
+ {"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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"}
@@ -1,6 +1,7 @@
1
1
  import _defineProperty from "@babel/runtime/helpers/defineProperty";
2
2
  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; }
3
3
  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; }
4
+ import { useState, useEffect } from 'react';
4
5
  import useSearch from '../useSearch';
5
6
  function useSearchResults({
6
7
  queryKey,
@@ -21,7 +22,16 @@ function useSearchResults({
21
22
  entities,
22
23
  fields
23
24
  });
25
+ const [currentResults, setCurrentResults] = useState([]);
26
+ const [allResults, setAllResults] = useState([]);
27
+ useEffect(() => {
28
+ if (currentResults.length !== results.length) {
29
+ setAllResults([...allResults, ...results]);
30
+ setCurrentResults(results);
31
+ }
32
+ }, [allResults, currentResults, currentResults.length, results]);
24
33
  const clearList = params => {
34
+ setAllResults([]);
25
35
  setParams(_objectSpread(_objectSpread({}, params), {}, {
26
36
  offset: 0
27
37
  }));
@@ -31,7 +41,7 @@ function useSearchResults({
31
41
  };
32
42
  return [{
33
43
  loading,
34
- results,
44
+ results: allResults,
35
45
  total
36
46
  }, setQueryParams];
37
47
  }
@@ -1 +1 @@
1
- {"version":3,"file":"useSearchResults.js","names":["useSearch","useSearchResults","queryKey","resultKeys","entities","fields","searchedValue","loading","data","results","total","setParams","clearList","params","_objectSpread","offset","setQueryParams","value"],"sources":["../../../src/components/useSearchResults/useSearchResults.js"],"sourcesContent":["import 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\n const clearList = params => {\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, total }, setQueryParams];\n}\n\nexport default useSearchResults;\n"],"mappings":";;;AAAA,OAAOA,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;EAEzD,MAAMO,SAAS,GAAGC,MAAM,IAAI;IAC1BF,SAAS,CAAAG,aAAA,CAAAA,aAAA,KAAMD,MAAM;MAAEE,MAAM,EAAE;IAAC,EAAE,CAAC;EACrC,CAAC;EAED,MAAMC,cAAc,GAAGH,MAAM,IAAI;IAC/BA,MAAM,CAACI,KAAK,KAAKX,aAAa,GAAGM,SAAS,CAACC,MAAM,CAAC,GAAGF,SAAS,CAACE,MAAM,CAAC;EACxE,CAAC;EAED,OAAO,CAAC;IAAEN,OAAO;IAAEE,OAAO;IAAEC;EAAM,CAAC,EAAEM,cAAc,CAAC;AACtD;AAEA,eAAef,gBAAgB"}
1
+ {"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 CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@blaze-cms/plugin-search-ui",
3
- "version": "0.129.0-project-admin-customisations.0",
3
+ "version": "0.129.0",
4
4
  "description": "Blaze plugin search ui",
5
5
  "main": "lib/index.js",
6
6
  "module": "lib-es/index.js",
@@ -27,9 +27,9 @@
27
27
  },
28
28
  "license": "GPL-3.0",
29
29
  "dependencies": {
30
- "@blaze-cms/admin-ui-utils": "0.129.0-project-admin-customisations.0",
31
- "@blaze-cms/core-errors": "0.129.0-project-admin-customisations.0",
32
- "@blaze-cms/setup-ui": "0.129.0-project-admin-customisations.0",
30
+ "@blaze-cms/admin-ui-utils": "^0.129.0",
31
+ "@blaze-cms/core-errors": "^0.127.0",
32
+ "@blaze-cms/setup-ui": "^0.128.1",
33
33
  "@blaze-react/button": "0.5.19",
34
34
  "@blaze-react/input": "0.5.30",
35
35
  "@blaze-react/utils": "0.5.15",
@@ -40,7 +40,7 @@
40
40
  "react-tiny-virtual-list": "2.2.0"
41
41
  },
42
42
  "devDependencies": {
43
- "@blaze-cms/core-ui": "0.129.0-project-admin-customisations.0"
43
+ "@blaze-cms/core-ui": "^0.129.0"
44
44
  },
45
45
  "peerDependencies": {
46
46
  "@apollo/client": "3.x",
@@ -52,5 +52,5 @@
52
52
  "lib/*",
53
53
  "lib-es/*"
54
54
  ],
55
- "gitHead": "e277f858e06d9e30c22e355ea5b44132ef5e910c"
55
+ "gitHead": "43e8a5d929313c50f8edb27358da7278299ce6c6"
56
56
  }
@@ -1,28 +1,21 @@
1
1
  import React, { useState, useRef, useEffect } from 'react';
2
2
  import classnames from 'classnames';
3
- import { useDebounce } from '@blaze-react/utils/lib/customHooks';
4
3
  import useLocalStorage from '../useLocalStorage';
5
4
  import SearchBar from './SearchBar';
6
5
  import RecentSearches from './RecentSearches';
7
6
  import SearchResults from './SearchResults';
8
7
  import TriggerModal from './TriggerModal';
9
- import SearchAdminSideBar from './SearchAdminSideBar';
10
8
  import useSearchResults from '../useSearchResults';
11
9
  import { SEARCH_ADMIN } from '../../constants';
12
10
 
13
11
  const SearchAdmin = () => {
14
12
  const [searchTerm, setSearchTerm] = useState('');
15
- const [openSearchSideBar, setOpenSearchSideBar] = useState(true);
16
- const [entityValues, setEntityValues] = useState([]);
17
-
18
13
  const [recentSearches, setRecentSearches] = useLocalStorage('recentSearches', []);
19
14
  const [displaySearchModalFrame, setDisplaySearchModalFrame] = useState(false);
20
15
  const [enableResults, setEnableResults] = useState(true);
21
16
  const searchInputRef = useRef(null);
22
- const debouncedEntityValues = useDebounce(entityValues, 500);
23
17
  const [{ loading, results, total }, setQueryParams] = useSearchResults({
24
- queryKey: SEARCH_ADMIN,
25
- entities: debouncedEntityValues.map(e => e.id)
18
+ queryKey: SEARCH_ADMIN
26
19
  });
27
20
 
28
21
  useEffect(
@@ -75,10 +68,6 @@ const SearchAdmin = () => {
75
68
  'modal--show': displaySearchModalFrame
76
69
  });
77
70
 
78
- const searchModalSideBarClassName = classnames('modal__search__sidebar', {
79
- 'modal__search__sidebar--close': !openSearchSideBar
80
- });
81
-
82
71
  const isEmptySearchTermAndData = !searchTerm && !results.length;
83
72
  const isEmptySearchTermnAndDisabledResults = !searchTerm && !enableResults;
84
73
  const shouldDisplayRecentSearches =
@@ -86,70 +75,51 @@ const SearchAdmin = () => {
86
75
 
87
76
  const showResults = enableResults && results.length;
88
77
 
89
- const handleSetEntityValues = newEntity => {
90
- const entityExists = entityValues.some(entity => entity.id === newEntity.id);
91
- if (entityExists) {
92
- setEntityValues(entityValues.filter(entity => entity.id !== newEntity.id));
93
- } else {
94
- setEntityValues([...entityValues, newEntity]);
95
- }
96
- };
97
-
98
78
  return (
99
79
  <div className="search search--header">
100
80
  <TriggerModal toggleSearchModal={toggleSearchModal} />
101
81
  <div className={searchModalResultsClassName}>
102
82
  {displaySearchModalFrame && (
103
- <div className="modal__search">
104
- <SearchAdminSideBar
105
- searchModalSideBarClassName={searchModalSideBarClassName}
106
- openSearchSideBar={openSearchSideBar}
107
- setOpenSearchSideBar={setOpenSearchSideBar}
108
- handleSetEntityValues={handleSetEntityValues}
109
- entityValues={entityValues}
110
- setEntityValues={setEntityValues}
111
- />
112
- <div className="modal__search__content">
113
- <div className="modal__header modal__header--search">
114
- <SearchBar
115
- toggleSearchModal={toggleSearchModal}
116
- handleKeyDown={handleKeyDown}
117
- searchInputRef={searchInputRef}
118
- handleSearchTerm={handleSearchTerm}
119
- searchTerm={searchTerm}
120
- search={() => search({ value: searchTerm })}
121
- />
122
- </div>
123
- {shouldDisplayRecentSearches ? (
124
- <RecentSearches
125
- recentSearches={recentSearches}
126
- handleSearchTerm={handleSearchTerm}
127
- search={search}
128
- />
129
- ) : (
130
- <>
131
- {!showResults && (
132
- <div className="list list--search">
133
- <div className="header header--list">
134
- <h2>No Results</h2>
135
- </div>
136
- </div>
137
- )}
138
- </>
139
- )}
140
- {showResults && (
141
- <SearchResults
142
- currentValue={searchTerm}
143
- searchTerm={searchTerm}
144
- loading={loading}
145
- results={results}
146
- total={total}
147
- setQueryParams={setQueryParams}
148
- closeModal={toggleSearchModal}
149
- />
150
- )}
83
+ <>
84
+ <div className="modal__header modal__header--search">
85
+ <SearchBar
86
+ toggleSearchModal={toggleSearchModal}
87
+ handleKeyDown={handleKeyDown}
88
+ searchInputRef={searchInputRef}
89
+ handleSearchTerm={handleSearchTerm}
90
+ searchTerm={searchTerm}
91
+ search={() => search({ value: searchTerm })}
92
+ />
151
93
  </div>
152
- </div>
94
+ {shouldDisplayRecentSearches ? (
95
+ <RecentSearches
96
+ recentSearches={recentSearches}
97
+ handleSearchTerm={handleSearchTerm}
98
+ search={search}
99
+ />
100
+ ) : (
101
+ <>
102
+ {!showResults && (
103
+ <div className="list list--search">
104
+ <div className="header header--list">
105
+ <h2>No Results</h2>
106
+ </div>
107
+ </div>
108
+ )}
109
+ </>
110
+ )}
111
+ {showResults && (
112
+ <SearchResults
113
+ currentValue={searchTerm}
114
+ searchTerm={searchTerm}
115
+ loading={loading}
116
+ results={results}
117
+ total={total}
118
+ setQueryParams={setQueryParams}
119
+ closeModal={toggleSearchModal}
120
+ />
121
+ )}
122
+ </>
153
123
  )}
154
124
  </div>
155
125
  </div>
@@ -54,9 +54,7 @@ const SearchResults = ({
54
54
  {loading && <span>Loading...</span>}
55
55
  <div className="modal__content modal__content--search">
56
56
  <div className="header header--list">
57
- <h2 className="header--list--results">
58
- About <b>{total}</b> search keywords results
59
- </h2>
57
+ <h2>{total} results</h2>
60
58
  </div>
61
59
  <VirtualList
62
60
  width="100%"
@@ -67,24 +65,15 @@ const SearchResults = ({
67
65
  scrollToIndex={currentIndex}
68
66
  onItemsRendered={handleRenderedItems}
69
67
  renderItem={({ index, style }) => {
70
- const {
71
- id,
72
- docType,
73
- updated,
74
- name,
75
- entityIdentifier,
76
- published,
77
- created,
78
- status
79
- } = results[index];
68
+ const { id, docType, updated, name } = results[index];
80
69
  const updatedDate = updated ? getDateFormat(updated) : null;
81
- const createdDate = created ? getDateFormat(created) : null;
82
- const publishedDate = published ? getDateFormat(published) : null;
83
70
  return (
84
71
  <div key={index} style={style} className="list__item--resultWrapper">
85
72
  <div className="list__item list__item--result">
86
73
  <div className="list__item-row list__item-row--result">
87
- <span className="list__item-identifier">{entityIdentifier}</span>
74
+ <span className="badge badge--primary">
75
+ {docType} {updatedDate}
76
+ </span>
88
77
  <a
89
78
  href={getNavigationRoute({
90
79
  id,
@@ -96,34 +85,9 @@ const SearchResults = ({
96
85
  docType
97
86
  })
98
87
  }
99
- className="list__item-link">
88
+ className="list__item-text list__item-text--result">
100
89
  {name}
101
90
  </a>
102
-
103
- <div className="list__item-dates">
104
- {publishedDate && (
105
- <span>
106
- <b>Published: </b>
107
- {publishedDate}
108
- </span>
109
- )}
110
- <span>
111
- <b>Created: </b>
112
- {createdDate}
113
- </span>
114
- <span>
115
- <b>Updated: </b>
116
- {updatedDate}
117
- </span>
118
- </div>
119
- <div className="list__item-status">
120
- {status && (
121
- <span>
122
- <b>Status: </b>
123
- {status}
124
- </span>
125
- )}
126
- </div>
127
91
  </div>
128
92
  </div>
129
93
  </div>
@@ -5,9 +5,7 @@ import searchQueries from '../../application/query';
5
5
  function useSearch({ queryKey, resultKeys, entities = [], fields }) {
6
6
  const [queryParams, setParams] = useState({ limit: 20, offset: 0, value: '' });
7
7
  const [searchedValue, setSearchedValue] = useState(null);
8
- const [en, setEn] = useState([]);
9
8
  const [previousOffset, setPreviousOffset] = useState(null);
10
-
11
9
  const buildSearchQuery = searchQueries[queryKey];
12
10
  const [
13
11
  getSearchResults,
@@ -30,14 +28,13 @@ function useSearch({ queryKey, resultKeys, entities = [], fields }) {
30
28
  const { limit, offset, value } = queryParams;
31
29
  const isNewValueSet = value && value !== searchedValue;
32
30
  const isNewOffsetSet = previousOffset !== null && offset !== previousOffset;
33
- const notSameLength = en.length !== entities.length;
34
31
  const parsedEntities = entities.length
35
32
  ? entities.map(entity => ({
36
33
  match: { docType: entity }
37
34
  }))
38
35
  : [];
39
36
 
40
- if (isNewValueSet || isNewOffsetSet || notSameLength) {
37
+ if (isNewValueSet || isNewOffsetSet) {
41
38
  getSearchResults({
42
39
  variables: {
43
40
  limit,
@@ -67,7 +64,6 @@ function useSearch({ queryKey, resultKeys, entities = [], fields }) {
67
64
  });
68
65
  setSearchedValue(value);
69
66
  setPreviousOffset(offset);
70
- setEn(entities);
71
67
  }
72
68
  },
73
69
  [
@@ -79,9 +75,7 @@ function useSearch({ queryKey, resultKeys, entities = [], fields }) {
79
75
  previousOffset,
80
76
  getSearchResults,
81
77
  entities,
82
- fields,
83
- entities.length,
84
- en.length
78
+ fields
85
79
  ]
86
80
  );
87
81
 
@@ -1,3 +1,4 @@
1
+ import { useState, useEffect } from 'react';
1
2
  import useSearch from '../useSearch';
2
3
 
3
4
  function useSearchResults({ queryKey, resultKeys, entities, fields }) {
@@ -9,8 +10,21 @@ function useSearchResults({ queryKey, resultKeys, entities, fields }) {
9
10
  },
10
11
  setParams
11
12
  ] = useSearch({ queryKey, resultKeys, entities, fields });
13
+ const [currentResults, setCurrentResults] = useState([]);
14
+ const [allResults, setAllResults] = useState([]);
15
+
16
+ useEffect(
17
+ () => {
18
+ if (currentResults.length !== results.length) {
19
+ setAllResults([...allResults, ...results]);
20
+ setCurrentResults(results);
21
+ }
22
+ },
23
+ [allResults, currentResults, currentResults.length, results]
24
+ );
12
25
 
13
26
  const clearList = params => {
27
+ setAllResults([]);
14
28
  setParams({ ...params, offset: 0 });
15
29
  };
16
30
 
@@ -18,7 +32,7 @@ function useSearchResults({ queryKey, resultKeys, entities, fields }) {
18
32
  params.value !== searchedValue ? clearList(params) : setParams(params);
19
33
  };
20
34
 
21
- return [{ loading, results, total }, setQueryParams];
35
+ return [{ loading, results: allResults, total }, setQueryParams];
22
36
  }
23
37
 
24
38
  export default useSearchResults;