@blaze-cms/plugin-search-ui 0.146.0-node18.1 → 0.146.0-rc-eagle-3.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.
- package/CHANGELOG.md +10 -9
- package/lib/application/query/index.js +31 -15
- package/lib/application/query/index.js.map +1 -1
- package/lib/components/SearchAdmin/RecentSearches/RecentSearches.js +33 -43
- package/lib/components/SearchAdmin/RecentSearches/RecentSearches.js.map +1 -1
- package/lib/components/SearchAdmin/RecentSearches/index.js +2 -3
- package/lib/components/SearchAdmin/RecentSearches/index.js.map +1 -1
- package/lib/components/SearchAdmin/SearchAdmin.js +64 -105
- package/lib/components/SearchAdmin/SearchAdmin.js.map +1 -1
- package/lib/components/SearchAdmin/SearchAdminSideBar/SearchAdminSideBar.js +51 -78
- package/lib/components/SearchAdmin/SearchAdminSideBar/SearchAdminSideBar.js.map +1 -1
- package/lib/components/SearchAdmin/SearchAdminSideBar/index.js +2 -3
- package/lib/components/SearchAdmin/SearchAdminSideBar/index.js.map +1 -1
- package/lib/components/SearchAdmin/SearchBar/SearchBar.js +41 -45
- package/lib/components/SearchAdmin/SearchBar/SearchBar.js.map +1 -1
- package/lib/components/SearchAdmin/SearchBar/index.js +2 -3
- package/lib/components/SearchAdmin/SearchBar/index.js.map +1 -1
- package/lib/components/SearchAdmin/SearchResults/SearchResults.js +101 -149
- package/lib/components/SearchAdmin/SearchResults/SearchResults.js.map +1 -1
- package/lib/components/SearchAdmin/SearchResults/index.js +2 -3
- package/lib/components/SearchAdmin/SearchResults/index.js.map +1 -1
- package/lib/components/SearchAdmin/TriggerModal/TriggerModal.js +10 -12
- package/lib/components/SearchAdmin/TriggerModal/TriggerModal.js.map +1 -1
- package/lib/components/SearchAdmin/TriggerModal/index.js +2 -3
- package/lib/components/SearchAdmin/TriggerModal/index.js.map +1 -1
- package/lib/components/SearchAdmin/index.js +2 -3
- package/lib/components/SearchAdmin/index.js.map +1 -1
- package/lib/components/SearchPublishedContent/SearchPublishedContent.js +75 -100
- package/lib/components/SearchPublishedContent/SearchPublishedContent.js.map +1 -1
- package/lib/components/SearchPublishedContent/index.js +2 -3
- package/lib/components/SearchPublishedContent/index.js.map +1 -1
- package/lib/components/useLocalStorage/index.js +2 -3
- package/lib/components/useLocalStorage/index.js.map +1 -1
- package/lib/components/useLocalStorage/useLocalStorage.js +8 -16
- package/lib/components/useLocalStorage/useLocalStorage.js.map +1 -1
- package/lib/components/useSearch/index.js +2 -3
- package/lib/components/useSearch/index.js.map +1 -1
- package/lib/components/useSearch/useSearch.js +64 -88
- package/lib/components/useSearch/useSearch.js.map +1 -1
- package/lib/components/useSearchResults/index.js +2 -3
- package/lib/components/useSearchResults/index.js.map +1 -1
- package/lib/components/useSearchResults/useSearchResults.js +34 -51
- package/lib/components/useSearchResults/useSearchResults.js.map +1 -1
- package/lib/constants.js +10 -10
- package/lib/constants.js.map +1 -1
- package/lib/hooks/index.js +2 -3
- package/lib/hooks/index.js.map +1 -1
- package/lib/hooks/useDebounceSearch.js +31 -38
- package/lib/hooks/useDebounceSearch.js.map +1 -1
- package/lib/index.js +8 -9
- package/lib/index.js.map +1 -1
- package/lib-es/components/SearchAdmin/SearchResults/SearchResults.js +2 -2
- package/lib-es/components/SearchAdmin/SearchResults/SearchResults.js.map +1 -1
- package/lib-es/components/useSearch/useSearch.js +8 -5
- package/lib-es/components/useSearch/useSearch.js.map +1 -1
- package/lib-es/components/useSearchResults/useSearchResults.js +4 -2
- package/lib-es/components/useSearchResults/useSearchResults.js.map +1 -1
- package/lib-es/constants.js +3 -2
- package/lib-es/constants.js.map +1 -1
- package/lib-es/hooks/useDebounceSearch.js +4 -2
- package/lib-es/hooks/useDebounceSearch.js.map +1 -1
- package/package.json +15 -11
- package/src/components/SearchAdmin/SearchResults/SearchResults.js +7 -2
- package/src/components/useSearch/useSearch.js +8 -5
- package/src/components/useSearchResults/useSearchResults.js +2 -2
- package/src/constants.js +4 -2
- package/src/hooks/useDebounceSearch.js +3 -2
- package/babel.config.js +0 -3
- package/jest.config.js +0 -5
package/lib/index.js
CHANGED
|
@@ -1,32 +1,31 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
require("core-js/modules/es.object.define-property.js");
|
|
4
3
|
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
5
4
|
Object.defineProperty(exports, "__esModule", {
|
|
6
5
|
value: true
|
|
7
6
|
});
|
|
8
7
|
Object.defineProperty(exports, "SearchAdmin", {
|
|
9
8
|
enumerable: true,
|
|
10
|
-
get: function
|
|
11
|
-
return _SearchAdmin
|
|
9
|
+
get: function () {
|
|
10
|
+
return _SearchAdmin.default;
|
|
12
11
|
}
|
|
13
12
|
});
|
|
14
13
|
Object.defineProperty(exports, "SearchBar", {
|
|
15
14
|
enumerable: true,
|
|
16
|
-
get: function
|
|
17
|
-
return _SearchBar
|
|
15
|
+
get: function () {
|
|
16
|
+
return _SearchBar.default;
|
|
18
17
|
}
|
|
19
18
|
});
|
|
20
19
|
Object.defineProperty(exports, "SearchPublishedContent", {
|
|
21
20
|
enumerable: true,
|
|
22
|
-
get: function
|
|
23
|
-
return _SearchPublishedContent
|
|
21
|
+
get: function () {
|
|
22
|
+
return _SearchPublishedContent.default;
|
|
24
23
|
}
|
|
25
24
|
});
|
|
26
25
|
Object.defineProperty(exports, "useDebounceSearch", {
|
|
27
26
|
enumerable: true,
|
|
28
|
-
get: function
|
|
29
|
-
return _useDebounceSearch
|
|
27
|
+
get: function () {
|
|
28
|
+
return _useDebounceSearch.default;
|
|
30
29
|
}
|
|
31
30
|
});
|
|
32
31
|
var _SearchAdmin = _interopRequireDefault(require("./components/SearchAdmin"));
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","names":["_SearchAdmin","_interopRequireDefault","require","_SearchPublishedContent","_SearchBar","_useDebounceSearch"],"sources":["../src/index.js"],"sourcesContent":["import SearchAdmin from './components/SearchAdmin';\nimport SearchPublishedContent from './components/SearchPublishedContent';\nimport SearchBar from './components/SearchAdmin/SearchBar';\nimport useDebounceSearch from './hooks/useDebounceSearch';\n\nexport { SearchAdmin, SearchPublishedContent, SearchBar, useDebounceSearch };\n"],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","names":["_SearchAdmin","_interopRequireDefault","require","_SearchPublishedContent","_SearchBar","_useDebounceSearch"],"sources":["../src/index.js"],"sourcesContent":["import SearchAdmin from './components/SearchAdmin';\nimport SearchPublishedContent from './components/SearchPublishedContent';\nimport SearchBar from './components/SearchAdmin/SearchBar';\nimport useDebounceSearch from './hooks/useDebounceSearch';\n\nexport { SearchAdmin, SearchPublishedContent, SearchBar, useDebounceSearch };\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,IAAAA,YAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,uBAAA,GAAAF,sBAAA,CAAAC,OAAA;AACA,IAAAE,UAAA,GAAAH,sBAAA,CAAAC,OAAA;AACA,IAAAG,kBAAA,GAAAJ,sBAAA,CAAAC,OAAA","ignoreList":[]}
|
|
@@ -4,7 +4,7 @@ import React, { useState, useEffect } from 'react';
|
|
|
4
4
|
import PropTypes from 'prop-types';
|
|
5
5
|
import VirtualList from 'react-tiny-virtual-list';
|
|
6
6
|
import { withRouter } from 'react-router-dom';
|
|
7
|
-
import { SEARCH_RESULTS_OVER_SCAN_BUFFER,
|
|
7
|
+
import { SEARCH_RESULTS_OVER_SCAN_BUFFER, SEARCH_RESULTS_ELEMENTS_HEIGHT_ABOVE_LIST, SEARCH_RESULTS_HEIGHT_OFFSET, SEARCH_RESULTS_ITEM_SIZE, FILE } from '../../../constants';
|
|
8
8
|
const SearchResults = ({
|
|
9
9
|
currentValue,
|
|
10
10
|
entities,
|
|
@@ -86,7 +86,7 @@ const SearchResults = ({
|
|
|
86
86
|
className: "header--list--results"
|
|
87
87
|
}, "About ", /*#__PURE__*/React.createElement("b", null, total), " search keywords results")), /*#__PURE__*/React.createElement(VirtualList, {
|
|
88
88
|
width: "100%",
|
|
89
|
-
height: window.innerHeight -
|
|
89
|
+
height: window.innerHeight - SEARCH_RESULTS_ELEMENTS_HEIGHT_ABOVE_LIST - SEARCH_RESULTS_HEIGHT_OFFSET,
|
|
90
90
|
itemCount: allResults.length,
|
|
91
91
|
itemSize: SEARCH_RESULTS_ITEM_SIZE,
|
|
92
92
|
overscanCount: SEARCH_RESULTS_OVER_SCAN_BUFFER,
|
|
@@ -1 +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","entities","loading","results","total","setQueryParams","closeModal","history","verifiedRanges","setVerifiedRanges","currentIndex","setCurrentIndex","currentResults","setCurrentResults","allResults","setAllResults","currentParams","setCurrentParams","newResults","map","id","join","newParams","length","concat","handleRenderedItems","startIndex","rowsLength","loadIndex","Math","floor","includes","value","offset","getNavigationRoute","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 entities,\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 [allResults, setAllResults] = useState([]);\n const [currentParams, setCurrentParams] = useState('');\n\n useEffect(() => {\n if (!loading) {\n const newResults = results.map(({ id }) => id).join(',');\n if (currentResults !== newResults) {\n const newParams = `${currentValue},${entities.join(',')}`;\n if (newParams !== currentParams) {\n setAllResults(results);\n setCurrentParams(newParams);\n if (verifiedRanges.length) setVerifiedRanges([]);\n } else {\n setAllResults(allResults.concat(results));\n }\n setCurrentResults(newResults);\n }\n }\n }, [\n allResults,\n currentParams,\n currentResults,\n currentValue,\n entities,\n loading,\n results,\n total,\n verifiedRanges.length\n ]);\n\n const handleRenderedItems = async ({ startIndex }) => {\n const rowsLength = allResults.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: allResults.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 (!allResults.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>{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={allResults.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, entityIdentifier, published, created, status } =\n allResults[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 entities: PropTypes.array.isRequired\n};\n\nexport default withRouter(SearchResults);\n"],"mappings":"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","ignoreList":[]}
|
|
1
|
+
{"version":3,"file":"SearchResults.js","names":["React","useState","useEffect","PropTypes","VirtualList","withRouter","SEARCH_RESULTS_OVER_SCAN_BUFFER","SEARCH_RESULTS_ELEMENTS_HEIGHT_ABOVE_LIST","SEARCH_RESULTS_HEIGHT_OFFSET","SEARCH_RESULTS_ITEM_SIZE","FILE","SearchResults","currentValue","entities","loading","results","total","setQueryParams","closeModal","history","verifiedRanges","setVerifiedRanges","currentIndex","setCurrentIndex","currentResults","setCurrentResults","allResults","setAllResults","currentParams","setCurrentParams","newResults","map","id","join","newParams","length","concat","handleRenderedItems","startIndex","rowsLength","loadIndex","Math","floor","includes","value","offset","getNavigationRoute","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_ELEMENTS_HEIGHT_ABOVE_LIST,\n SEARCH_RESULTS_HEIGHT_OFFSET,\n SEARCH_RESULTS_ITEM_SIZE,\n FILE\n} from '../../../constants';\n\nconst SearchResults = ({\n currentValue,\n entities,\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 [allResults, setAllResults] = useState([]);\n const [currentParams, setCurrentParams] = useState('');\n\n useEffect(() => {\n if (!loading) {\n const newResults = results.map(({ id }) => id).join(',');\n if (currentResults !== newResults) {\n const newParams = `${currentValue},${entities.join(',')}`;\n if (newParams !== currentParams) {\n setAllResults(results);\n setCurrentParams(newParams);\n if (verifiedRanges.length) setVerifiedRanges([]);\n } else {\n setAllResults(allResults.concat(results));\n }\n setCurrentResults(newResults);\n }\n }\n }, [\n allResults,\n currentParams,\n currentResults,\n currentValue,\n entities,\n loading,\n results,\n total,\n verifiedRanges.length\n ]);\n\n const handleRenderedItems = async ({ startIndex }) => {\n const rowsLength = allResults.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: allResults.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 (!allResults.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>{total}</b> search keywords results\n </h2>\n </div>\n <VirtualList\n width=\"100%\"\n height={\n window.innerHeight -\n SEARCH_RESULTS_ELEMENTS_HEIGHT_ABOVE_LIST -\n SEARCH_RESULTS_HEIGHT_OFFSET\n }\n itemCount={allResults.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, entityIdentifier, published, created, status } =\n allResults[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 entities: PropTypes.array.isRequired\n};\n\nexport default withRouter(SearchResults);\n"],"mappings":"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","ignoreList":[]}
|
|
@@ -9,7 +9,8 @@ function useSearch({
|
|
|
9
9
|
resultKeys,
|
|
10
10
|
entities = [],
|
|
11
11
|
fields,
|
|
12
|
-
extraFilters
|
|
12
|
+
extraFilters,
|
|
13
|
+
queryHook
|
|
13
14
|
}) {
|
|
14
15
|
const [queryParams, setParams] = useState({
|
|
15
16
|
limit: 20,
|
|
@@ -62,8 +63,8 @@ function useSearch({
|
|
|
62
63
|
docType: entity
|
|
63
64
|
}
|
|
64
65
|
})) : [];
|
|
65
|
-
if (isNewValueSet || isNewOffsetSet || notSameLength) {
|
|
66
|
-
|
|
66
|
+
if (value && (isNewValueSet || isNewOffsetSet || notSameLength)) {
|
|
67
|
+
const variables = {
|
|
67
68
|
variables: {
|
|
68
69
|
limit,
|
|
69
70
|
offset,
|
|
@@ -87,12 +88,14 @@ function useSearch({
|
|
|
87
88
|
}
|
|
88
89
|
}
|
|
89
90
|
}
|
|
90
|
-
}
|
|
91
|
+
};
|
|
92
|
+
const updatedVariables = queryHook ? queryHook(variables) : variables;
|
|
93
|
+
getSearchResults(updatedVariables);
|
|
91
94
|
setSearchedValue(value);
|
|
92
95
|
setPreviousOffset(offset);
|
|
93
96
|
setPreviousEntities(entities);
|
|
94
97
|
}
|
|
95
|
-
}, [queryParams, queryParams.limit, queryParams.value, queryParams.offset, searchedValue, previousOffset, getSearchResults, entities, fields, entities.length, previousEntities.length, extraFilters]);
|
|
98
|
+
}, [queryParams, queryParams.limit, queryParams.value, queryParams.offset, searchedValue, previousOffset, getSearchResults, entities, fields, entities.length, previousEntities.length, extraFilters, queryHook]);
|
|
96
99
|
return [{
|
|
97
100
|
searchedValue: queryParams.value,
|
|
98
101
|
loading,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useSearch.js","names":["useState","useEffect","useLazyQuery","searchQueries","useSearch","queryKey","resultKeys","entities","fields","extraFilters","queryParams","setParams","limit","offset","value","searchedValue","setSearchedValue","previousEntities","setPreviousEntities","previousOffset","setPreviousOffset","buildSearchQuery","getSearchResults","loading","data","ssr","search","defaultSearch","results","jsonResults","total","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, extraFilters }) {\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 [getSearchResults, { loading, data = {} } = {}] = useLazyQuery(\n buildSearchQuery({ resultKeys }),\n { ssr: false }\n );\n\n const { search } = data;\n\n const defaultSearch = {\n results: [],\n jsonResults: null,\n total: 0\n };\n\n const { results, jsonResults, total } = search ?? defaultSearch;\n\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 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
|
|
1
|
+
{"version":3,"file":"useSearch.js","names":["useState","useEffect","useLazyQuery","searchQueries","useSearch","queryKey","resultKeys","entities","fields","extraFilters","queryHook","queryParams","setParams","limit","offset","value","searchedValue","setSearchedValue","previousEntities","setPreviousEntities","previousOffset","setPreviousOffset","buildSearchQuery","getSearchResults","loading","data","ssr","search","defaultSearch","results","jsonResults","total","handleQueryParams","newQueryParams","_objectSpread","isNewValueSet","isNewOffsetSet","notSameLength","length","parsedEntities","map","entity","match","docType","variables","rawQuery","query","bool","must","query_string","type","default_operator","should","updatedVariables"],"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, extraFilters, queryHook }) {\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 [getSearchResults, { loading, data = {} } = {}] = useLazyQuery(\n buildSearchQuery({ resultKeys }),\n { ssr: false }\n );\n\n const { search } = data;\n\n const defaultSearch = {\n results: [],\n jsonResults: null,\n total: 0\n };\n\n const { results, jsonResults, total } = search ?? defaultSearch;\n\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 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 (value && (isNewValueSet || isNewOffsetSet || notSameLength)) {\n const variables = {\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 extraFilters\n }\n },\n {\n bool: {\n should: parsedEntities\n }\n }\n ]\n }\n }\n }\n }\n };\n const updatedVariables = queryHook ? queryHook(variables) : variables;\n getSearchResults(updatedVariables);\n setSearchedValue(value);\n setPreviousOffset(offset);\n setPreviousEntities(entities);\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 extraFilters,\n queryHook\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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","ignoreList":[]}
|
|
@@ -7,7 +7,8 @@ function useSearchResults({
|
|
|
7
7
|
queryKey,
|
|
8
8
|
resultKeys,
|
|
9
9
|
entities,
|
|
10
|
-
fields
|
|
10
|
+
fields,
|
|
11
|
+
queryHook
|
|
11
12
|
}) {
|
|
12
13
|
const [currentResults, setCurrentResults] = useState([]);
|
|
13
14
|
const [allResults, setAllResults] = useState([]);
|
|
@@ -22,7 +23,8 @@ function useSearchResults({
|
|
|
22
23
|
queryKey,
|
|
23
24
|
resultKeys,
|
|
24
25
|
entities,
|
|
25
|
-
fields
|
|
26
|
+
fields,
|
|
27
|
+
queryHook
|
|
26
28
|
});
|
|
27
29
|
useEffect(() => {
|
|
28
30
|
if (currentResults.length !== results.length) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useSearchResults.js","names":["useState","useEffect","useSearch","useSearchResults","queryKey","resultKeys","entities","fields","currentResults","setCurrentResults","allResults","setAllResults","searchedValue","loading","data","results","total","setParams","length","clearList","params","_objectSpread","offset","setQueryParams","value","newResults"],"sources":["../../../src/components/useSearchResults/useSearchResults.js"],"sourcesContent":["import { useState, useEffect } from 'react';\nimport useSearch from '../useSearch';\n\nfunction useSearchResults({ queryKey, resultKeys, entities, fields }) {\n const [currentResults, setCurrentResults] = useState([]);\n const [allResults, setAllResults] = useState([]);\n const [\n {\n searchedValue,\n loading,\n data: { results, total }\n },\n setParams\n ] = useSearch({ queryKey, resultKeys, entities, fields });\n\n useEffect(() => {\n if (currentResults.length !== results.length) {\n setAllResults([...allResults, ...results]);\n setCurrentResults(results);\n }\n }, [allResults, currentResults, results]);\n\n const clearList = params => {\n setAllResults([]);\n setParams({ ...params, offset: 0 });\n };\n\n const setQueryParams = params => {\n params.value !== searchedValue ? clearList(params) : setParams(params);\n };\n\n return [\n {\n loading,\n results: allResults,\n currentResults,\n newResults: results,\n total\n },\n setQueryParams\n ];\n}\n\nexport default useSearchResults;\n"],"mappings":";;;AAAA,SAASA,QAAQ,EAAEC,SAAS,QAAQ,OAAO;AAC3C,OAAOC,SAAS,MAAM,cAAc;AAEpC,SAASC,gBAAgBA,CAAC;EAAEC,QAAQ;EAAEC,UAAU;EAAEC,QAAQ;EAAEC;
|
|
1
|
+
{"version":3,"file":"useSearchResults.js","names":["useState","useEffect","useSearch","useSearchResults","queryKey","resultKeys","entities","fields","queryHook","currentResults","setCurrentResults","allResults","setAllResults","searchedValue","loading","data","results","total","setParams","length","clearList","params","_objectSpread","offset","setQueryParams","value","newResults"],"sources":["../../../src/components/useSearchResults/useSearchResults.js"],"sourcesContent":["import { useState, useEffect } from 'react';\nimport useSearch from '../useSearch';\n\nfunction useSearchResults({ queryKey, resultKeys, entities, fields, queryHook }) {\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, queryHook });\n\n useEffect(() => {\n if (currentResults.length !== results.length) {\n setAllResults([...allResults, ...results]);\n setCurrentResults(results);\n }\n }, [allResults, currentResults, results]);\n\n const clearList = params => {\n setAllResults([]);\n setParams({ ...params, offset: 0 });\n };\n\n const setQueryParams = params => {\n params.value !== searchedValue ? clearList(params) : setParams(params);\n };\n\n return [\n {\n loading,\n results: allResults,\n currentResults,\n newResults: results,\n total\n },\n setQueryParams\n ];\n}\n\nexport default useSearchResults;\n"],"mappings":";;;AAAA,SAASA,QAAQ,EAAEC,SAAS,QAAQ,OAAO;AAC3C,OAAOC,SAAS,MAAM,cAAc;AAEpC,SAASC,gBAAgBA,CAAC;EAAEC,QAAQ;EAAEC,UAAU;EAAEC,QAAQ;EAAEC,MAAM;EAAEC;AAAU,CAAC,EAAE;EAC/E,MAAM,CAACC,cAAc,EAAEC,iBAAiB,CAAC,GAAGV,QAAQ,CAAC,EAAE,CAAC;EACxD,MAAM,CAACW,UAAU,EAAEC,aAAa,CAAC,GAAGZ,QAAQ,CAAC,EAAE,CAAC;EAChD,MAAM,CACJ;IACEa,aAAa;IACbC,OAAO;IACPC,IAAI,EAAE;MAAEC,OAAO;MAAEC;IAAM;EACzB,CAAC,EACDC,SAAS,CACV,GAAGhB,SAAS,CAAC;IAAEE,QAAQ;IAAEC,UAAU;IAAEC,QAAQ;IAAEC,MAAM;IAAEC;EAAU,CAAC,CAAC;EAEpEP,SAAS,CAAC,MAAM;IACd,IAAIQ,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,EAAE,CAACL,UAAU,EAAEF,cAAc,EAAEO,OAAO,CAAC,CAAC;EAEzC,MAAMI,SAAS,GAAGC,MAAM,IAAI;IAC1BT,aAAa,CAAC,EAAE,CAAC;IACjBM,SAAS,CAAAI,aAAA,CAAAA,aAAA,KAAMD,MAAM;MAAEE,MAAM,EAAE;IAAC,EAAE,CAAC;EACrC,CAAC;EAED,MAAMC,cAAc,GAAGH,MAAM,IAAI;IAC/BA,MAAM,CAACI,KAAK,KAAKZ,aAAa,GAAGO,SAAS,CAACC,MAAM,CAAC,GAAGH,SAAS,CAACG,MAAM,CAAC;EACxE,CAAC;EAED,OAAO,CACL;IACEP,OAAO;IACPE,OAAO,EAAEL,UAAU;IACnBF,cAAc;IACdiB,UAAU,EAAEV,OAAO;IACnBC;EACF,CAAC,EACDO,cAAc,CACf;AACH;AAEA,eAAerB,gBAAgB","ignoreList":[]}
|
package/lib-es/constants.js
CHANGED
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
const SEARCH_ADMIN = 'SEARCH_ADMIN';
|
|
2
2
|
const SEARCH_PUBLISHED = 'SEARCH_PUBLISHED';
|
|
3
3
|
const SEARCH_RESULTS_OVER_SCAN_BUFFER = 0;
|
|
4
|
-
const
|
|
4
|
+
const SEARCH_RESULTS_ELEMENTS_HEIGHT_ABOVE_LIST = 186;
|
|
5
|
+
const SEARCH_RESULTS_HEIGHT_OFFSET = 100;
|
|
5
6
|
const SEARCH_RESULTS_ITEM_SIZE = 105;
|
|
6
7
|
const DEFAULT_RESULTS_KEYS = 'name, url';
|
|
7
8
|
const SEARCH_BUTTON = 'search-button';
|
|
8
9
|
const FILE = 'file';
|
|
9
|
-
export { SEARCH_ADMIN, SEARCH_PUBLISHED, SEARCH_RESULTS_OVER_SCAN_BUFFER,
|
|
10
|
+
export { SEARCH_ADMIN, SEARCH_PUBLISHED, SEARCH_RESULTS_OVER_SCAN_BUFFER, SEARCH_RESULTS_ELEMENTS_HEIGHT_ABOVE_LIST, SEARCH_RESULTS_HEIGHT_OFFSET, SEARCH_RESULTS_ITEM_SIZE, DEFAULT_RESULTS_KEYS, SEARCH_BUTTON, FILE };
|
|
10
11
|
//# sourceMappingURL=constants.js.map
|
package/lib-es/constants.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","names":["SEARCH_ADMIN","SEARCH_PUBLISHED","SEARCH_RESULTS_OVER_SCAN_BUFFER","
|
|
1
|
+
{"version":3,"file":"constants.js","names":["SEARCH_ADMIN","SEARCH_PUBLISHED","SEARCH_RESULTS_OVER_SCAN_BUFFER","SEARCH_RESULTS_ELEMENTS_HEIGHT_ABOVE_LIST","SEARCH_RESULTS_HEIGHT_OFFSET","SEARCH_RESULTS_ITEM_SIZE","DEFAULT_RESULTS_KEYS","SEARCH_BUTTON","FILE"],"sources":["../src/constants.js"],"sourcesContent":["const SEARCH_ADMIN = 'SEARCH_ADMIN';\nconst SEARCH_PUBLISHED = 'SEARCH_PUBLISHED';\nconst SEARCH_RESULTS_OVER_SCAN_BUFFER = 0;\nconst SEARCH_RESULTS_ELEMENTS_HEIGHT_ABOVE_LIST = 186;\nconst SEARCH_RESULTS_HEIGHT_OFFSET = 100;\nconst SEARCH_RESULTS_ITEM_SIZE = 105;\nconst DEFAULT_RESULTS_KEYS = 'name, url';\nconst SEARCH_BUTTON = 'search-button';\nconst FILE = 'file';\n\nexport {\n SEARCH_ADMIN,\n SEARCH_PUBLISHED,\n SEARCH_RESULTS_OVER_SCAN_BUFFER,\n SEARCH_RESULTS_ELEMENTS_HEIGHT_ABOVE_LIST,\n SEARCH_RESULTS_HEIGHT_OFFSET,\n SEARCH_RESULTS_ITEM_SIZE,\n DEFAULT_RESULTS_KEYS,\n SEARCH_BUTTON,\n FILE\n};\n"],"mappings":"AAAA,MAAMA,YAAY,GAAG,cAAc;AACnC,MAAMC,gBAAgB,GAAG,kBAAkB;AAC3C,MAAMC,+BAA+B,GAAG,CAAC;AACzC,MAAMC,yCAAyC,GAAG,GAAG;AACrD,MAAMC,4BAA4B,GAAG,GAAG;AACxC,MAAMC,wBAAwB,GAAG,GAAG;AACpC,MAAMC,oBAAoB,GAAG,WAAW;AACxC,MAAMC,aAAa,GAAG,eAAe;AACrC,MAAMC,IAAI,GAAG,MAAM;AAEnB,SACER,YAAY,EACZC,gBAAgB,EAChBC,+BAA+B,EAC/BC,yCAAyC,EACzCC,4BAA4B,EAC5BC,wBAAwB,EACxBC,oBAAoB,EACpBC,aAAa,EACbC,IAAI","ignoreList":[]}
|
|
@@ -6,7 +6,8 @@ const useDebounceSearch = ({
|
|
|
6
6
|
entities,
|
|
7
7
|
resultKeys,
|
|
8
8
|
fields,
|
|
9
|
-
initialSearchTerm
|
|
9
|
+
initialSearchTerm,
|
|
10
|
+
queryHook
|
|
10
11
|
}) => {
|
|
11
12
|
const [searchTerm, setSearchTerm] = useState(initialSearchTerm !== null && initialSearchTerm !== void 0 ? initialSearchTerm : '');
|
|
12
13
|
const [previousSearchTerm, setPreviousSearchTerm] = useState(null);
|
|
@@ -18,7 +19,8 @@ const useDebounceSearch = ({
|
|
|
18
19
|
queryKey: SEARCH_PUBLISHED,
|
|
19
20
|
resultKeys,
|
|
20
21
|
entities,
|
|
21
|
-
fields
|
|
22
|
+
fields,
|
|
23
|
+
queryHook
|
|
22
24
|
});
|
|
23
25
|
useEffect(() => {
|
|
24
26
|
if (debouncedSearchTerm && debouncedSearchTerm !== previousSearchTerm) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useDebounceSearch.js","names":["useEffect","useState","useDebounce","useSearchResults","SEARCH_PUBLISHED","useDebounceSearch","entities","resultKeys","fields","initialSearchTerm","searchTerm","setSearchTerm","previousSearchTerm","setPreviousSearchTerm","debouncedSearchTerm","loading","results","setQueryParams","queryKey","value"],"sources":["../../src/hooks/useDebounceSearch.js"],"sourcesContent":["import { useEffect, useState } from 'react';\nimport { useDebounce } from '@blaze-react/utils/lib/customHooks';\nimport useSearchResults from '../components/useSearchResults';\nimport { SEARCH_PUBLISHED } from '../constants';\n\nconst useDebounceSearch = ({ entities, resultKeys, fields, initialSearchTerm }) => {\n const [searchTerm, setSearchTerm] = useState(initialSearchTerm ?? '');\n const [previousSearchTerm, setPreviousSearchTerm] = useState(null);\n const debouncedSearchTerm = useDebounce(searchTerm, 500);\n\n const [{ loading, results }, setQueryParams] = useSearchResults({\n queryKey: SEARCH_PUBLISHED,\n resultKeys,\n entities,\n fields\n });\n\n useEffect(() => {\n if (debouncedSearchTerm && debouncedSearchTerm !== previousSearchTerm) {\n setQueryParams({ value: debouncedSearchTerm });\n setPreviousSearchTerm(debouncedSearchTerm);\n }\n }, [debouncedSearchTerm, previousSearchTerm, setQueryParams]);\n\n return {\n loading,\n results,\n searchTerm,\n setSearchTerm,\n setPreviousSearchTerm,\n debouncedSearchTerm,\n previousSearchTerm\n };\n};\n\nexport default useDebounceSearch;\n"],"mappings":"AAAA,SAASA,SAAS,EAAEC,QAAQ,QAAQ,OAAO;AAC3C,SAASC,WAAW,QAAQ,oCAAoC;AAChE,OAAOC,gBAAgB,MAAM,gCAAgC;AAC7D,SAASC,gBAAgB,QAAQ,cAAc;AAE/C,MAAMC,iBAAiB,GAAGA,CAAC;EAAEC,QAAQ;EAAEC,UAAU;EAAEC,MAAM;EAAEC;
|
|
1
|
+
{"version":3,"file":"useDebounceSearch.js","names":["useEffect","useState","useDebounce","useSearchResults","SEARCH_PUBLISHED","useDebounceSearch","entities","resultKeys","fields","initialSearchTerm","queryHook","searchTerm","setSearchTerm","previousSearchTerm","setPreviousSearchTerm","debouncedSearchTerm","loading","results","setQueryParams","queryKey","value"],"sources":["../../src/hooks/useDebounceSearch.js"],"sourcesContent":["import { useEffect, useState } from 'react';\nimport { useDebounce } from '@blaze-react/utils/lib/customHooks';\nimport useSearchResults from '../components/useSearchResults';\nimport { SEARCH_PUBLISHED } from '../constants';\n\nconst useDebounceSearch = ({ entities, resultKeys, fields, initialSearchTerm, queryHook }) => {\n const [searchTerm, setSearchTerm] = useState(initialSearchTerm ?? '');\n const [previousSearchTerm, setPreviousSearchTerm] = useState(null);\n const debouncedSearchTerm = useDebounce(searchTerm, 500);\n\n const [{ loading, results }, setQueryParams] = useSearchResults({\n queryKey: SEARCH_PUBLISHED,\n resultKeys,\n entities,\n fields,\n queryHook\n });\n\n useEffect(() => {\n if (debouncedSearchTerm && debouncedSearchTerm !== previousSearchTerm) {\n setQueryParams({ value: debouncedSearchTerm });\n setPreviousSearchTerm(debouncedSearchTerm);\n }\n }, [debouncedSearchTerm, previousSearchTerm, setQueryParams]);\n\n return {\n loading,\n results,\n searchTerm,\n setSearchTerm,\n setPreviousSearchTerm,\n debouncedSearchTerm,\n previousSearchTerm\n };\n};\n\nexport default useDebounceSearch;\n"],"mappings":"AAAA,SAASA,SAAS,EAAEC,QAAQ,QAAQ,OAAO;AAC3C,SAASC,WAAW,QAAQ,oCAAoC;AAChE,OAAOC,gBAAgB,MAAM,gCAAgC;AAC7D,SAASC,gBAAgB,QAAQ,cAAc;AAE/C,MAAMC,iBAAiB,GAAGA,CAAC;EAAEC,QAAQ;EAAEC,UAAU;EAAEC,MAAM;EAAEC,iBAAiB;EAAEC;AAAU,CAAC,KAAK;EAC5F,MAAM,CAACC,UAAU,EAAEC,aAAa,CAAC,GAAGX,QAAQ,CAACQ,iBAAiB,aAAjBA,iBAAiB,cAAjBA,iBAAiB,GAAI,EAAE,CAAC;EACrE,MAAM,CAACI,kBAAkB,EAAEC,qBAAqB,CAAC,GAAGb,QAAQ,CAAC,IAAI,CAAC;EAClE,MAAMc,mBAAmB,GAAGb,WAAW,CAACS,UAAU,EAAE,GAAG,CAAC;EAExD,MAAM,CAAC;IAAEK,OAAO;IAAEC;EAAQ,CAAC,EAAEC,cAAc,CAAC,GAAGf,gBAAgB,CAAC;IAC9DgB,QAAQ,EAAEf,gBAAgB;IAC1BG,UAAU;IACVD,QAAQ;IACRE,MAAM;IACNE;EACF,CAAC,CAAC;EAEFV,SAAS,CAAC,MAAM;IACd,IAAIe,mBAAmB,IAAIA,mBAAmB,KAAKF,kBAAkB,EAAE;MACrEK,cAAc,CAAC;QAAEE,KAAK,EAAEL;MAAoB,CAAC,CAAC;MAC9CD,qBAAqB,CAACC,mBAAmB,CAAC;IAC5C;EACF,CAAC,EAAE,CAACA,mBAAmB,EAAEF,kBAAkB,EAAEK,cAAc,CAAC,CAAC;EAE7D,OAAO;IACLF,OAAO;IACPC,OAAO;IACPN,UAAU;IACVC,aAAa;IACbE,qBAAqB;IACrBC,mBAAmB;IACnBF;EACF,CAAC;AACH,CAAC;AAED,eAAeR,iBAAiB","ignoreList":[]}
|
package/package.json
CHANGED
|
@@ -1,10 +1,15 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@blaze-cms/plugin-search-ui",
|
|
3
|
-
"version": "0.146.0-
|
|
3
|
+
"version": "0.146.0-rc-eagle-3.0",
|
|
4
4
|
"description": "Blaze plugin search ui",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"module": "lib-es/index.js",
|
|
7
|
-
"
|
|
7
|
+
"files": [
|
|
8
|
+
"lib",
|
|
9
|
+
"lib-es",
|
|
10
|
+
"src"
|
|
11
|
+
],
|
|
12
|
+
"source": "src/index.js",
|
|
8
13
|
"directories": {
|
|
9
14
|
"src": "src/"
|
|
10
15
|
},
|
|
@@ -27,31 +32,30 @@
|
|
|
27
32
|
},
|
|
28
33
|
"license": "GPL-3.0",
|
|
29
34
|
"dependencies": {
|
|
30
|
-
"@blaze-cms/admin-ui-utils": "0.146.0-
|
|
31
|
-
"@blaze-cms/core-errors": "0.146.0-
|
|
32
|
-
"@blaze-cms/setup-ui": "0.146.0-
|
|
35
|
+
"@blaze-cms/admin-ui-utils": "0.146.0-rc-eagle-3.0",
|
|
36
|
+
"@blaze-cms/core-errors": "0.146.0-rc-eagle-3.0",
|
|
37
|
+
"@blaze-cms/setup-ui": "0.146.0-rc-eagle-3.0",
|
|
33
38
|
"@blaze-react/button": "0.5.19",
|
|
34
39
|
"@blaze-react/checkboxes": "^0.7.0",
|
|
35
|
-
"@blaze-react/input": "0.8.0-alpha.
|
|
40
|
+
"@blaze-react/input": "0.8.0-alpha.100",
|
|
36
41
|
"@blaze-react/utils": "0.5.15",
|
|
37
42
|
"classnames": "^2.2.6",
|
|
38
|
-
"core-js": "^3.2.1",
|
|
39
43
|
"react-icons": "^4.11.0",
|
|
40
44
|
"react-router-dom": "^5.0.1",
|
|
41
45
|
"react-tiny-virtual-list": "2.2.0"
|
|
42
46
|
},
|
|
43
47
|
"devDependencies": {
|
|
44
|
-
"@blaze-cms/core-ui": "0.146.0-
|
|
48
|
+
"@blaze-cms/core-ui": "0.146.0-rc-eagle-3.0"
|
|
45
49
|
},
|
|
46
50
|
"peerDependencies": {
|
|
47
51
|
"@apollo/client": "3.x",
|
|
48
|
-
"@blaze-cms/admin": "^0.
|
|
52
|
+
"@blaze-cms/admin": "^0.145.0",
|
|
49
53
|
"prop-types": "^15.7.2",
|
|
50
|
-
"react": "
|
|
54
|
+
"react": ">= 18"
|
|
51
55
|
},
|
|
52
56
|
"eslintIgnore": [
|
|
53
57
|
"lib/*",
|
|
54
58
|
"lib-es/*"
|
|
55
59
|
],
|
|
56
|
-
"gitHead": "
|
|
60
|
+
"gitHead": "eeb5c91d33bae79f7605ffa99d8cbf430840e27a"
|
|
57
61
|
}
|
|
@@ -6,7 +6,8 @@ import VirtualList from 'react-tiny-virtual-list';
|
|
|
6
6
|
import { withRouter } from 'react-router-dom';
|
|
7
7
|
import {
|
|
8
8
|
SEARCH_RESULTS_OVER_SCAN_BUFFER,
|
|
9
|
-
|
|
9
|
+
SEARCH_RESULTS_ELEMENTS_HEIGHT_ABOVE_LIST,
|
|
10
|
+
SEARCH_RESULTS_HEIGHT_OFFSET,
|
|
10
11
|
SEARCH_RESULTS_ITEM_SIZE,
|
|
11
12
|
FILE
|
|
12
13
|
} from '../../../constants';
|
|
@@ -98,7 +99,11 @@ const SearchResults = ({
|
|
|
98
99
|
</div>
|
|
99
100
|
<VirtualList
|
|
100
101
|
width="100%"
|
|
101
|
-
height={
|
|
102
|
+
height={
|
|
103
|
+
window.innerHeight -
|
|
104
|
+
SEARCH_RESULTS_ELEMENTS_HEIGHT_ABOVE_LIST -
|
|
105
|
+
SEARCH_RESULTS_HEIGHT_OFFSET
|
|
106
|
+
}
|
|
102
107
|
itemCount={allResults.length}
|
|
103
108
|
itemSize={SEARCH_RESULTS_ITEM_SIZE}
|
|
104
109
|
overscanCount={SEARCH_RESULTS_OVER_SCAN_BUFFER}
|
|
@@ -2,7 +2,7 @@ import { useState, useEffect } from 'react';
|
|
|
2
2
|
import { useLazyQuery } from '@apollo/client';
|
|
3
3
|
import searchQueries from '../../application/query';
|
|
4
4
|
|
|
5
|
-
function useSearch({ queryKey, resultKeys, entities = [], fields, extraFilters }) {
|
|
5
|
+
function useSearch({ queryKey, resultKeys, entities = [], fields, extraFilters, queryHook }) {
|
|
6
6
|
const [queryParams, setParams] = useState({ limit: 20, offset: 0, value: '' });
|
|
7
7
|
const [searchedValue, setSearchedValue] = useState(null);
|
|
8
8
|
const [previousEntities, setPreviousEntities] = useState([]);
|
|
@@ -42,8 +42,8 @@ function useSearch({ queryKey, resultKeys, entities = [], fields, extraFilters }
|
|
|
42
42
|
}))
|
|
43
43
|
: [];
|
|
44
44
|
|
|
45
|
-
if (isNewValueSet || isNewOffsetSet || notSameLength) {
|
|
46
|
-
|
|
45
|
+
if (value && (isNewValueSet || isNewOffsetSet || notSameLength)) {
|
|
46
|
+
const variables = {
|
|
47
47
|
variables: {
|
|
48
48
|
limit,
|
|
49
49
|
offset,
|
|
@@ -70,7 +70,9 @@ function useSearch({ queryKey, resultKeys, entities = [], fields, extraFilters }
|
|
|
70
70
|
}
|
|
71
71
|
}
|
|
72
72
|
}
|
|
73
|
-
}
|
|
73
|
+
};
|
|
74
|
+
const updatedVariables = queryHook ? queryHook(variables) : variables;
|
|
75
|
+
getSearchResults(updatedVariables);
|
|
74
76
|
setSearchedValue(value);
|
|
75
77
|
setPreviousOffset(offset);
|
|
76
78
|
setPreviousEntities(entities);
|
|
@@ -87,7 +89,8 @@ function useSearch({ queryKey, resultKeys, entities = [], fields, extraFilters }
|
|
|
87
89
|
fields,
|
|
88
90
|
entities.length,
|
|
89
91
|
previousEntities.length,
|
|
90
|
-
extraFilters
|
|
92
|
+
extraFilters,
|
|
93
|
+
queryHook
|
|
91
94
|
]);
|
|
92
95
|
|
|
93
96
|
return [
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { useState, useEffect } from 'react';
|
|
2
2
|
import useSearch from '../useSearch';
|
|
3
3
|
|
|
4
|
-
function useSearchResults({ queryKey, resultKeys, entities, fields }) {
|
|
4
|
+
function useSearchResults({ queryKey, resultKeys, entities, fields, queryHook }) {
|
|
5
5
|
const [currentResults, setCurrentResults] = useState([]);
|
|
6
6
|
const [allResults, setAllResults] = useState([]);
|
|
7
7
|
const [
|
|
@@ -11,7 +11,7 @@ function useSearchResults({ queryKey, resultKeys, entities, fields }) {
|
|
|
11
11
|
data: { results, total }
|
|
12
12
|
},
|
|
13
13
|
setParams
|
|
14
|
-
] = useSearch({ queryKey, resultKeys, entities, fields });
|
|
14
|
+
] = useSearch({ queryKey, resultKeys, entities, fields, queryHook });
|
|
15
15
|
|
|
16
16
|
useEffect(() => {
|
|
17
17
|
if (currentResults.length !== results.length) {
|
package/src/constants.js
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
const SEARCH_ADMIN = 'SEARCH_ADMIN';
|
|
2
2
|
const SEARCH_PUBLISHED = 'SEARCH_PUBLISHED';
|
|
3
3
|
const SEARCH_RESULTS_OVER_SCAN_BUFFER = 0;
|
|
4
|
-
const
|
|
4
|
+
const SEARCH_RESULTS_ELEMENTS_HEIGHT_ABOVE_LIST = 186;
|
|
5
|
+
const SEARCH_RESULTS_HEIGHT_OFFSET = 100;
|
|
5
6
|
const SEARCH_RESULTS_ITEM_SIZE = 105;
|
|
6
7
|
const DEFAULT_RESULTS_KEYS = 'name, url';
|
|
7
8
|
const SEARCH_BUTTON = 'search-button';
|
|
@@ -11,7 +12,8 @@ export {
|
|
|
11
12
|
SEARCH_ADMIN,
|
|
12
13
|
SEARCH_PUBLISHED,
|
|
13
14
|
SEARCH_RESULTS_OVER_SCAN_BUFFER,
|
|
14
|
-
|
|
15
|
+
SEARCH_RESULTS_ELEMENTS_HEIGHT_ABOVE_LIST,
|
|
16
|
+
SEARCH_RESULTS_HEIGHT_OFFSET,
|
|
15
17
|
SEARCH_RESULTS_ITEM_SIZE,
|
|
16
18
|
DEFAULT_RESULTS_KEYS,
|
|
17
19
|
SEARCH_BUTTON,
|
|
@@ -3,7 +3,7 @@ import { useDebounce } from '@blaze-react/utils/lib/customHooks';
|
|
|
3
3
|
import useSearchResults from '../components/useSearchResults';
|
|
4
4
|
import { SEARCH_PUBLISHED } from '../constants';
|
|
5
5
|
|
|
6
|
-
const useDebounceSearch = ({ entities, resultKeys, fields, initialSearchTerm }) => {
|
|
6
|
+
const useDebounceSearch = ({ entities, resultKeys, fields, initialSearchTerm, queryHook }) => {
|
|
7
7
|
const [searchTerm, setSearchTerm] = useState(initialSearchTerm ?? '');
|
|
8
8
|
const [previousSearchTerm, setPreviousSearchTerm] = useState(null);
|
|
9
9
|
const debouncedSearchTerm = useDebounce(searchTerm, 500);
|
|
@@ -12,7 +12,8 @@ const useDebounceSearch = ({ entities, resultKeys, fields, initialSearchTerm })
|
|
|
12
12
|
queryKey: SEARCH_PUBLISHED,
|
|
13
13
|
resultKeys,
|
|
14
14
|
entities,
|
|
15
|
-
fields
|
|
15
|
+
fields,
|
|
16
|
+
queryHook
|
|
16
17
|
});
|
|
17
18
|
|
|
18
19
|
useEffect(() => {
|
package/babel.config.js
DELETED