@blaze-cms/plugin-search-ui 0.146.0-node18-core-styles-tooltips.5 → 0.146.0-node18-core-styles-tooltips.11
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 +11 -0
- package/lib/components/useSearch/useSearch.js +8 -5
- package/lib/components/useSearch/useSearch.js.map +1 -1
- package/lib/components/useSearchResults/useSearchResults.js +4 -2
- package/lib/components/useSearchResults/useSearchResults.js.map +1 -1
- package/lib/hooks/useDebounceSearch.js +4 -2
- package/lib/hooks/useDebounceSearch.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/hooks/useDebounceSearch.js +4 -2
- package/lib-es/hooks/useDebounceSearch.js.map +1 -1
- package/package.json +2 -2
- package/src/components/useSearch/useSearch.js +10 -7
- package/src/components/useSearchResults/useSearchResults.js +2 -2
- package/src/hooks/useDebounceSearch.js +3 -2
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,17 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
# [0.146.0-node18-core-styles-tooltips.11](https://github.com/thebyte9/blaze/compare/v0.146.0-node18-core-styles-tooltips.10...v0.146.0-node18-core-styles-tooltips.11) (2025-08-27)
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
### Features
|
|
10
|
+
|
|
11
|
+
* add hook for search content component ([#4866](https://github.com/thebyte9/blaze/issues/4866)) ([2fe2fb9](https://github.com/thebyte9/blaze/commit/2fe2fb91a13199b2c7cabbd734c3b79f9c962cad))
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
|
|
16
|
+
|
|
6
17
|
# [0.146.0-node18-core-styles-tooltips.5](https://github.com/thebyte9/blaze/compare/v0.146.0-node18-core-styles-tooltips.4...v0.146.0-node18-core-styles-tooltips.5) (2025-07-18)
|
|
7
18
|
|
|
8
19
|
**Note:** Version bump only for package @blaze-cms/plugin-search-ui
|
|
@@ -31,7 +31,8 @@ function useSearch(_ref) {
|
|
|
31
31
|
_ref$entities = _ref.entities,
|
|
32
32
|
entities = _ref$entities === void 0 ? [] : _ref$entities,
|
|
33
33
|
fields = _ref.fields,
|
|
34
|
-
extraFilters = _ref.extraFilters
|
|
34
|
+
extraFilters = _ref.extraFilters,
|
|
35
|
+
queryHook = _ref.queryHook;
|
|
35
36
|
var _useState = (0, _react.useState)({
|
|
36
37
|
limit: 20,
|
|
37
38
|
offset: 0,
|
|
@@ -96,8 +97,8 @@ function useSearch(_ref) {
|
|
|
96
97
|
}
|
|
97
98
|
};
|
|
98
99
|
}) : [];
|
|
99
|
-
if (isNewValueSet || isNewOffsetSet || notSameLength) {
|
|
100
|
-
|
|
100
|
+
if (value && (isNewValueSet || isNewOffsetSet || notSameLength)) {
|
|
101
|
+
var variables = {
|
|
101
102
|
variables: {
|
|
102
103
|
limit: limit,
|
|
103
104
|
offset: offset,
|
|
@@ -121,12 +122,14 @@ function useSearch(_ref) {
|
|
|
121
122
|
}
|
|
122
123
|
}
|
|
123
124
|
}
|
|
124
|
-
}
|
|
125
|
+
};
|
|
126
|
+
var updatedVariables = queryHook ? queryHook(variables) : variables;
|
|
127
|
+
getSearchResults(updatedVariables);
|
|
125
128
|
setSearchedValue(value);
|
|
126
129
|
setPreviousOffset(offset);
|
|
127
130
|
setPreviousEntities(entities);
|
|
128
131
|
}
|
|
129
|
-
}, [queryParams, queryParams.limit, queryParams.value, queryParams.offset, searchedValue, previousOffset, getSearchResults, entities, fields, entities.length, previousEntities.length, extraFilters]);
|
|
132
|
+
}, [queryParams, queryParams.limit, queryParams.value, queryParams.offset, searchedValue, previousOffset, getSearchResults, entities, fields, entities.length, previousEntities.length, extraFilters, queryHook]);
|
|
130
133
|
return [{
|
|
131
134
|
searchedValue: queryParams.value,
|
|
132
135
|
loading: loading,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useSearch.js","names":["_react","require","_client","_query","_interopRequireDefault","ownKeys","e","r","t","Object","keys","getOwnPropertySymbols","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty2","getOwnPropertyDescriptors","defineProperties","defineProperty","useSearch","_ref","queryKey","resultKeys","_ref$entities","entities","fields","extraFilters","_useState","useState","limit","offset","value","_useState2","_slicedToArray2","queryParams","setParams","_useState3","_useState4","searchedValue","setSearchedValue","_useState5","_useState6","previousEntities","setPreviousEntities","_useState7","_useState8","previousOffset","setPreviousOffset","buildSearchQuery","searchQueries","_useLazyQuery","useLazyQuery","ssr","_useLazyQuery2","getSearchResults","_useLazyQuery2$","_useLazyQuery2$2","loading","_useLazyQuery2$2$data","data","search","defaultSearch","results","jsonResults","total","_ref2","handleQueryParams","newQueryParams","useEffect","isNewValueSet","isNewOffsetSet","notSameLength","parsedEntities","map","entity","match","docType","variables","rawQuery","query","bool","must","query_string","type","default_operator","should","_default","exports"],"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
|
|
1
|
+
{"version":3,"file":"useSearch.js","names":["_react","require","_client","_query","_interopRequireDefault","ownKeys","e","r","t","Object","keys","getOwnPropertySymbols","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty2","getOwnPropertyDescriptors","defineProperties","defineProperty","useSearch","_ref","queryKey","resultKeys","_ref$entities","entities","fields","extraFilters","queryHook","_useState","useState","limit","offset","value","_useState2","_slicedToArray2","queryParams","setParams","_useState3","_useState4","searchedValue","setSearchedValue","_useState5","_useState6","previousEntities","setPreviousEntities","_useState7","_useState8","previousOffset","setPreviousOffset","buildSearchQuery","searchQueries","_useLazyQuery","useLazyQuery","ssr","_useLazyQuery2","getSearchResults","_useLazyQuery2$","_useLazyQuery2$2","loading","_useLazyQuery2$2$data","data","search","defaultSearch","results","jsonResults","total","_ref2","handleQueryParams","newQueryParams","useEffect","isNewValueSet","isNewOffsetSet","notSameLength","parsedEntities","map","entity","match","docType","variables","rawQuery","query","bool","must","query_string","type","default_operator","should","updatedVariables","_default","exports"],"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":[]}
|
|
@@ -27,7 +27,8 @@ function useSearchResults(_ref) {
|
|
|
27
27
|
var queryKey = _ref.queryKey,
|
|
28
28
|
resultKeys = _ref.resultKeys,
|
|
29
29
|
entities = _ref.entities,
|
|
30
|
-
fields = _ref.fields
|
|
30
|
+
fields = _ref.fields,
|
|
31
|
+
queryHook = _ref.queryHook;
|
|
31
32
|
var _useState = (0, _react.useState)([]),
|
|
32
33
|
_useState2 = (0, _slicedToArray2["default"])(_useState, 2),
|
|
33
34
|
currentResults = _useState2[0],
|
|
@@ -40,7 +41,8 @@ function useSearchResults(_ref) {
|
|
|
40
41
|
queryKey: queryKey,
|
|
41
42
|
resultKeys: resultKeys,
|
|
42
43
|
entities: entities,
|
|
43
|
-
fields: fields
|
|
44
|
+
fields: fields,
|
|
45
|
+
queryHook: queryHook
|
|
44
46
|
}),
|
|
45
47
|
_useSearch2 = (0, _slicedToArray2["default"])(_useSearch, 2),
|
|
46
48
|
_useSearch2$ = _useSearch2[0],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useSearchResults.js","names":["_react","require","_useSearch3","_interopRequireDefault","ownKeys","e","r","t","Object","keys","getOwnPropertySymbols","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty2","getOwnPropertyDescriptors","defineProperties","defineProperty","useSearchResults","_ref","queryKey","resultKeys","entities","fields","_useState","useState","_useState2","_slicedToArray2","currentResults","setCurrentResults","_useState3","_useState4","allResults","setAllResults","_useSearch","useSearch","_useSearch2","_useSearch2$","searchedValue","loading","_useSearch2$$data","data","results","total","setParams","useEffect","concat","_toConsumableArray2","clearList","params","offset","setQueryParams","value","newResults","_default","exports"],"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,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,WAAA,GAAAC,sBAAA,CAAAF,OAAA;AAAqC,SAAAG,QAAAC,CAAA,EAAAC,CAAA,QAAAC,CAAA,GAAAC,MAAA,CAAAC,IAAA,CAAAJ,CAAA,OAAAG,MAAA,CAAAE,qBAAA,QAAAC,CAAA,GAAAH,MAAA,CAAAE,qBAAA,CAAAL,CAAA,GAAAC,CAAA,KAAAK,CAAA,GAAAA,CAAA,CAAAC,MAAA,WAAAN,CAAA,WAAAE,MAAA,CAAAK,wBAAA,CAAAR,CAAA,EAAAC,CAAA,EAAAQ,UAAA,OAAAP,CAAA,CAAAQ,IAAA,CAAAC,KAAA,CAAAT,CAAA,EAAAI,CAAA,YAAAJ,CAAA;AAAA,SAAAU,cAAAZ,CAAA,aAAAC,CAAA,MAAAA,CAAA,GAAAY,SAAA,CAAAC,MAAA,EAAAb,CAAA,UAAAC,CAAA,WAAAW,SAAA,CAAAZ,CAAA,IAAAY,SAAA,CAAAZ,CAAA,QAAAA,CAAA,OAAAF,OAAA,CAAAI,MAAA,CAAAD,CAAA,OAAAa,OAAA,WAAAd,CAAA,QAAAe,gBAAA,aAAAhB,CAAA,EAAAC,CAAA,EAAAC,CAAA,CAAAD,CAAA,SAAAE,MAAA,CAAAc,yBAAA,GAAAd,MAAA,CAAAe,gBAAA,CAAAlB,CAAA,EAAAG,MAAA,CAAAc,yBAAA,CAAAf,CAAA,KAAAH,OAAA,CAAAI,MAAA,CAAAD,CAAA,GAAAa,OAAA,WAAAd,CAAA,IAAAE,MAAA,CAAAgB,cAAA,CAAAnB,CAAA,EAAAC,CAAA,EAAAE,MAAA,CAAAK,wBAAA,CAAAN,CAAA,EAAAD,CAAA,iBAAAD,CAAA;AAErC,SAASoB,gBAAgBA,CAAAC,IAAA,
|
|
1
|
+
{"version":3,"file":"useSearchResults.js","names":["_react","require","_useSearch3","_interopRequireDefault","ownKeys","e","r","t","Object","keys","getOwnPropertySymbols","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty2","getOwnPropertyDescriptors","defineProperties","defineProperty","useSearchResults","_ref","queryKey","resultKeys","entities","fields","queryHook","_useState","useState","_useState2","_slicedToArray2","currentResults","setCurrentResults","_useState3","_useState4","allResults","setAllResults","_useSearch","useSearch","_useSearch2","_useSearch2$","searchedValue","loading","_useSearch2$$data","data","results","total","setParams","useEffect","concat","_toConsumableArray2","clearList","params","offset","setQueryParams","value","newResults","_default","exports"],"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":"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","ignoreList":[]}
|
|
@@ -15,7 +15,8 @@ var useDebounceSearch = function useDebounceSearch(_ref) {
|
|
|
15
15
|
var entities = _ref.entities,
|
|
16
16
|
resultKeys = _ref.resultKeys,
|
|
17
17
|
fields = _ref.fields,
|
|
18
|
-
initialSearchTerm = _ref.initialSearchTerm
|
|
18
|
+
initialSearchTerm = _ref.initialSearchTerm,
|
|
19
|
+
queryHook = _ref.queryHook;
|
|
19
20
|
var _useState = (0, _react.useState)(initialSearchTerm !== null && initialSearchTerm !== void 0 ? initialSearchTerm : ''),
|
|
20
21
|
_useState2 = (0, _slicedToArray2["default"])(_useState, 2),
|
|
21
22
|
searchTerm = _useState2[0],
|
|
@@ -29,7 +30,8 @@ var useDebounceSearch = function useDebounceSearch(_ref) {
|
|
|
29
30
|
queryKey: _constants.SEARCH_PUBLISHED,
|
|
30
31
|
resultKeys: resultKeys,
|
|
31
32
|
entities: entities,
|
|
32
|
-
fields: fields
|
|
33
|
+
fields: fields,
|
|
34
|
+
queryHook: queryHook
|
|
33
35
|
}),
|
|
34
36
|
_useSearchResults2 = (0, _slicedToArray2["default"])(_useSearchResults, 2),
|
|
35
37
|
_useSearchResults2$ = _useSearchResults2[0],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useDebounceSearch.js","names":["_react","require","_customHooks","_useSearchResults3","_interopRequireDefault","_constants","useDebounceSearch","_ref","entities","resultKeys","fields","initialSearchTerm","_useState","useState","_useState2","_slicedToArray2","searchTerm","setSearchTerm","_useState3","_useState4","previousSearchTerm","setPreviousSearchTerm","debouncedSearchTerm","useDebounce","_useSearchResults","useSearchResults","queryKey","SEARCH_PUBLISHED","_useSearchResults2","_useSearchResults2$","loading","results","setQueryParams","useEffect","value","_default","exports"],"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,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,YAAA,GAAAD,OAAA;AACA,IAAAE,kBAAA,GAAAC,sBAAA,CAAAH,OAAA;AACA,IAAAI,UAAA,GAAAJ,OAAA;AAEA,IAAMK,iBAAiB,GAAG,SAApBA,iBAAiBA,CAAAC,IAAA,
|
|
1
|
+
{"version":3,"file":"useDebounceSearch.js","names":["_react","require","_customHooks","_useSearchResults3","_interopRequireDefault","_constants","useDebounceSearch","_ref","entities","resultKeys","fields","initialSearchTerm","queryHook","_useState","useState","_useState2","_slicedToArray2","searchTerm","setSearchTerm","_useState3","_useState4","previousSearchTerm","setPreviousSearchTerm","debouncedSearchTerm","useDebounce","_useSearchResults","useSearchResults","queryKey","SEARCH_PUBLISHED","_useSearchResults2","_useSearchResults2$","loading","results","setQueryParams","useEffect","value","_default","exports"],"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,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,YAAA,GAAAD,OAAA;AACA,IAAAE,kBAAA,GAAAC,sBAAA,CAAAH,OAAA;AACA,IAAAI,UAAA,GAAAJ,OAAA;AAEA,IAAMK,iBAAiB,GAAG,SAApBA,iBAAiBA,CAAAC,IAAA,EAAuE;EAAA,IAAjEC,QAAQ,GAAAD,IAAA,CAARC,QAAQ;IAAEC,UAAU,GAAAF,IAAA,CAAVE,UAAU;IAAEC,MAAM,GAAAH,IAAA,CAANG,MAAM;IAAEC,iBAAiB,GAAAJ,IAAA,CAAjBI,iBAAiB;IAAEC,SAAS,GAAAL,IAAA,CAATK,SAAS;EACrF,IAAAC,SAAA,GAAoC,IAAAC,eAAQ,EAACH,iBAAiB,aAAjBA,iBAAiB,cAAjBA,iBAAiB,GAAI,EAAE,CAAC;IAAAI,UAAA,OAAAC,eAAA,aAAAH,SAAA;IAA9DI,UAAU,GAAAF,UAAA;IAAEG,aAAa,GAAAH,UAAA;EAChC,IAAAI,UAAA,GAAoD,IAAAL,eAAQ,EAAC,IAAI,CAAC;IAAAM,UAAA,OAAAJ,eAAA,aAAAG,UAAA;IAA3DE,kBAAkB,GAAAD,UAAA;IAAEE,qBAAqB,GAAAF,UAAA;EAChD,IAAMG,mBAAmB,GAAG,IAAAC,wBAAW,EAACP,UAAU,EAAE,GAAG,CAAC;EAExD,IAAAQ,iBAAA,GAA+C,IAAAC,6BAAgB,EAAC;MAC9DC,QAAQ,EAAEC,2BAAgB;MAC1BnB,UAAU,EAAVA,UAAU;MACVD,QAAQ,EAARA,QAAQ;MACRE,MAAM,EAANA,MAAM;MACNE,SAAS,EAATA;IACF,CAAC,CAAC;IAAAiB,kBAAA,OAAAb,eAAA,aAAAS,iBAAA;IAAAK,mBAAA,GAAAD,kBAAA;IANOE,OAAO,GAAAD,mBAAA,CAAPC,OAAO;IAAEC,OAAO,GAAAF,mBAAA,CAAPE,OAAO;IAAIC,cAAc,GAAAJ,kBAAA;EAQ3C,IAAAK,gBAAS,EAAC,YAAM;IACd,IAAIX,mBAAmB,IAAIA,mBAAmB,KAAKF,kBAAkB,EAAE;MACrEY,cAAc,CAAC;QAAEE,KAAK,EAAEZ;MAAoB,CAAC,CAAC;MAC9CD,qBAAqB,CAACC,mBAAmB,CAAC;IAC5C;EACF,CAAC,EAAE,CAACA,mBAAmB,EAAEF,kBAAkB,EAAEY,cAAc,CAAC,CAAC;EAE7D,OAAO;IACLF,OAAO,EAAPA,OAAO;IACPC,OAAO,EAAPA,OAAO;IACPf,UAAU,EAAVA,UAAU;IACVC,aAAa,EAAbA,aAAa;IACbI,qBAAqB,EAArBA,qBAAqB;IACrBC,mBAAmB,EAAnBA,mBAAmB;IACnBF,kBAAkB,EAAlBA;EACF,CAAC;AACH,CAAC;AAAC,IAAAe,QAAA,GAAAC,OAAA,cAEa/B,iBAAiB","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
|
|
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":[]}
|
|
@@ -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,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@blaze-cms/plugin-search-ui",
|
|
3
|
-
"version": "0.146.0-node18-core-styles-tooltips.
|
|
3
|
+
"version": "0.146.0-node18-core-styles-tooltips.11",
|
|
4
4
|
"description": "Blaze plugin search ui",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"module": "lib-es/index.js",
|
|
@@ -53,5 +53,5 @@
|
|
|
53
53
|
"lib/*",
|
|
54
54
|
"lib-es/*"
|
|
55
55
|
],
|
|
56
|
-
"gitHead": "
|
|
56
|
+
"gitHead": "e022ddbfa2dd8442b0dba2e04cd8575b458a1115"
|
|
57
57
|
}
|
|
@@ -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([]);
|
|
@@ -38,12 +38,12 @@ function useSearch({ queryKey, resultKeys, entities = [], fields, extraFilters }
|
|
|
38
38
|
const notSameLength = previousEntities.length !== entities.length;
|
|
39
39
|
const parsedEntities = entities.length
|
|
40
40
|
? entities.map(entity => ({
|
|
41
|
-
|
|
42
|
-
|
|
41
|
+
match: { docType: entity }
|
|
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) {
|
|
@@ -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(() => {
|