@blaze-cms/plugin-search-ui 0.118.0-alpha.0 → 0.119.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 +36 -0
- package/lib/application/query/index.js +3 -3
- package/lib/application/query/index.js.map +1 -1
- package/lib/components/useSearch/useSearch.js +7 -4
- package/lib/components/useSearch/useSearch.js.map +1 -1
- package/lib-es/application/query/index.js +1 -1
- package/lib-es/application/query/index.js.map +1 -1
- package/lib-es/components/useSearch/useSearch.js +5 -2
- package/lib-es/components/useSearch/useSearch.js.map +1 -1
- package/package.json +7 -8
- package/src/application/query/index.js +1 -1
- package/src/components/useSearch/useSearch.js +4 -2
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,42 @@
|
|
|
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.119.0](https://github.com/thebyte9/blaze/compare/v0.119.0-alpha.2...v0.119.0) (2022-01-28)
|
|
7
|
+
|
|
8
|
+
**Note:** Version bump only for package @blaze-cms/plugin-search-ui
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
# [0.119.0-alpha.1](https://github.com/thebyte9/blaze/compare/v0.119.0-alpha.0...v0.119.0-alpha.1) (2022-01-27)
|
|
15
|
+
|
|
16
|
+
**Note:** Version bump only for package @blaze-cms/plugin-search-ui
|
|
17
|
+
|
|
18
|
+
|
|
19
|
+
|
|
20
|
+
|
|
21
|
+
|
|
22
|
+
# [0.119.0-alpha.0](https://github.com/thebyte9/blaze/compare/v0.118.1-alpha.0...v0.119.0-alpha.0) (2022-01-26)
|
|
23
|
+
|
|
24
|
+
|
|
25
|
+
### Features
|
|
26
|
+
|
|
27
|
+
* update apollo client to v3.5 add cache redirects and optimise queries ([#3308](https://github.com/thebyte9/blaze/issues/3308)) ([5281b17](https://github.com/thebyte9/blaze/commit/5281b17fd972f8c727d099f0c814e747896af431))
|
|
28
|
+
* upgrade next to latest version ([#3290](https://github.com/thebyte9/blaze/issues/3290)) ([d2c37bd](https://github.com/thebyte9/blaze/commit/d2c37bd1bf7847dbbbaf7ab8634008c2042f91f9))
|
|
29
|
+
|
|
30
|
+
|
|
31
|
+
|
|
32
|
+
|
|
33
|
+
|
|
34
|
+
# [0.118.0](https://github.com/thebyte9/blaze/compare/v0.118.0-alpha.3...v0.118.0) (2022-01-25)
|
|
35
|
+
|
|
36
|
+
**Note:** Version bump only for package @blaze-cms/plugin-search-ui
|
|
37
|
+
|
|
38
|
+
|
|
39
|
+
|
|
40
|
+
|
|
41
|
+
|
|
6
42
|
# [0.118.0-alpha.0](https://github.com/thebyte9/blaze/compare/v0.117.0...v0.118.0-alpha.0) (2022-01-13)
|
|
7
43
|
|
|
8
44
|
**Note:** Version bump only for package @blaze-cms/plugin-search-ui
|
|
@@ -11,17 +11,17 @@ exports["default"] = void 0;
|
|
|
11
11
|
|
|
12
12
|
var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
|
|
13
13
|
|
|
14
|
-
var
|
|
14
|
+
var _client = require("@apollo/client");
|
|
15
15
|
|
|
16
16
|
var _templateObject, _templateObject2;
|
|
17
17
|
|
|
18
18
|
var SEARCH_ADMIN = function SEARCH_ADMIN() {
|
|
19
|
-
return (0,
|
|
19
|
+
return (0, _client.gql)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n query searchAdmin($limit: Int, $offset: Int, $sort: String, $rawQuery: JSON!) {\n search: searchAdmin(limit: $limit, offset: $offset, sort: $sort, rawQuery: $rawQuery) {\n jsonResults\n total\n }\n }\n"])));
|
|
20
20
|
};
|
|
21
21
|
|
|
22
22
|
var SEARCH_PUBLISHED = function SEARCH_PUBLISHED(_ref) {
|
|
23
23
|
var resultKeys = _ref.resultKeys;
|
|
24
|
-
return (0,
|
|
24
|
+
return (0, _client.gql)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2["default"])(["\n query searchPublishedContent($limit: Int, $offset: Int, $sort: String, $rawQuery: JSON!) {\n search: searchPublishedContent(\n limit: $limit\n offset: $offset\n sort: $sort\n rawQuery: $rawQuery\n ) {\n results {\n ", "\n }\n total\n }\n }\n"])), resultKeys);
|
|
25
25
|
};
|
|
26
26
|
|
|
27
27
|
var _default = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/application/query/index.js"],"names":["SEARCH_ADMIN","gql","SEARCH_PUBLISHED","resultKeys"],"mappings":";;;;;;;;;;;;;AAAA;;;;AAEA,IAAMA,YAAY,GAAG,SAAfA,YAAe;AAAA,aAAMC,
|
|
1
|
+
{"version":3,"sources":["../../../src/application/query/index.js"],"names":["SEARCH_ADMIN","gql","SEARCH_PUBLISHED","resultKeys"],"mappings":";;;;;;;;;;;;;AAAA;;;;AAEA,IAAMA,YAAY,GAAG,SAAfA,YAAe;AAAA,aAAMC,WAAN;AAAA,CAArB;;AASA,IAAMC,gBAAgB,GAAG,SAAnBA,gBAAmB;AAAA,MAAGC,UAAH,QAAGA,UAAH;AAAA,aAAoBF,WAApB,mYASfE,UATe;AAAA,CAAzB;;eAgBe;AAAEH,EAAAA,YAAY,EAAZA,YAAF;AAAgBE,EAAAA,gBAAgB,EAAhBA;AAAhB,C","sourcesContent":["import { gql } from '@apollo/client';\n\nconst SEARCH_ADMIN = () => gql`\n query searchAdmin($limit: Int, $offset: Int, $sort: String, $rawQuery: JSON!) {\n search: searchAdmin(limit: $limit, offset: $offset, sort: $sort, rawQuery: $rawQuery) {\n jsonResults\n total\n }\n }\n`;\n\nconst SEARCH_PUBLISHED = ({ resultKeys }) => gql`\n query searchPublishedContent($limit: Int, $offset: Int, $sort: String, $rawQuery: JSON!) {\n search: searchPublishedContent(\n limit: $limit\n offset: $offset\n sort: $sort\n rawQuery: $rawQuery\n ) {\n results {\n ${resultKeys}\n }\n total\n }\n }\n`;\n\nexport default { SEARCH_ADMIN, SEARCH_PUBLISHED };\n"],"file":"index.js"}
|
|
@@ -39,7 +39,7 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
|
|
|
39
39
|
|
|
40
40
|
var _react = require("react");
|
|
41
41
|
|
|
42
|
-
var
|
|
42
|
+
var _client = require("@apollo/client");
|
|
43
43
|
|
|
44
44
|
var _query = _interopRequireDefault(require("../../application/query"));
|
|
45
45
|
|
|
@@ -75,9 +75,11 @@ function useSearch(_ref) {
|
|
|
75
75
|
|
|
76
76
|
var buildSearchQuery = _query["default"][queryKey];
|
|
77
77
|
|
|
78
|
-
var _useLazyQuery = (0,
|
|
78
|
+
var _useLazyQuery = (0, _client.useLazyQuery)(buildSearchQuery({
|
|
79
79
|
resultKeys: resultKeys
|
|
80
|
-
})
|
|
80
|
+
}), {
|
|
81
|
+
ssr: false
|
|
82
|
+
}),
|
|
81
83
|
_useLazyQuery2 = (0, _slicedToArray2["default"])(_useLazyQuery, 2),
|
|
82
84
|
getSearchResults = _useLazyQuery2[0],
|
|
83
85
|
_useLazyQuery2$ = _useLazyQuery2[1],
|
|
@@ -93,7 +95,8 @@ function useSearch(_ref) {
|
|
|
93
95
|
var _useLazyQuery2$$data$ = _useLazyQuery2$$data.search,
|
|
94
96
|
results = _useLazyQuery2$$data$.results,
|
|
95
97
|
jsonResults = _useLazyQuery2$$data$.jsonResults,
|
|
96
|
-
total = _useLazyQuery2$$data$.total;
|
|
98
|
+
total = _useLazyQuery2$$data$.total; // todo: remove ssr: false once this bug is resolved https://github.com/apollographql/apollo-client/issues/9108
|
|
99
|
+
// without ssr: false clients can hang in ssr.
|
|
97
100
|
|
|
98
101
|
var handleQueryParams = function handleQueryParams(newQueryParams) {
|
|
99
102
|
setParams(_objectSpread(_objectSpread({}, queryParams), newQueryParams));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/components/useSearch/useSearch.js"],"names":["useSearch","queryKey","resultKeys","entities","fields","limit","offset","value","queryParams","setParams","searchedValue","setSearchedValue","previousOffset","setPreviousOffset","buildSearchQuery","searchQueries","getSearchResults","loading","data","search","results","total","jsonResults","handleQueryParams","newQueryParams","isNewValueSet","isNewOffsetSet","parsedEntities","length","map","entity","match","docType","variables","rawQuery","query","bool","must","query_string","type","should"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;AACA;;AACA;;;;;;AAEA,SAASA,SAAT,OAAoE;AAAA,MAA/CC,QAA+C,QAA/CA,QAA+C;AAAA,MAArCC,UAAqC,QAArCA,UAAqC;AAAA,2BAAzBC,QAAyB;AAAA,MAAzBA,QAAyB,8BAAd,EAAc;AAAA,MAAVC,MAAU,QAAVA,MAAU;;AAClE,kBAAiC,qBAAS;AAAEC,IAAAA,KAAK,EAAE,EAAT;AAAaC,IAAAA,MAAM,EAAE,CAArB;AAAwBC,IAAAA,KAAK,EAAE;AAA/B,GAAT,CAAjC;AAAA;AAAA,MAAOC,WAAP;AAAA,MAAoBC,SAApB;;AACA,mBAA0C,qBAAS,IAAT,CAA1C;AAAA;AAAA,MAAOC,aAAP;AAAA,MAAsBC,gBAAtB;;AACA,mBAA4C,qBAAS,IAAT,CAA5C;AAAA;AAAA,MAAOC,cAAP;AAAA,MAAuBC,iBAAvB;;AACA,MAAMC,gBAAgB,GAAGC,kBAAcd,QAAd,CAAzB;;AACA,sBAQI
|
|
1
|
+
{"version":3,"sources":["../../../src/components/useSearch/useSearch.js"],"names":["useSearch","queryKey","resultKeys","entities","fields","limit","offset","value","queryParams","setParams","searchedValue","setSearchedValue","previousOffset","setPreviousOffset","buildSearchQuery","searchQueries","ssr","getSearchResults","loading","data","search","results","total","jsonResults","handleQueryParams","newQueryParams","isNewValueSet","isNewOffsetSet","parsedEntities","length","map","entity","match","docType","variables","rawQuery","query","bool","must","query_string","type","should"],"mappings":"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","sourcesContent":["import { useState, useEffect } from 'react';\nimport { useLazyQuery } from '@apollo/client';\nimport searchQueries from '../../application/query';\n\nfunction useSearch({ queryKey, resultKeys, entities = [], fields }) {\n const [queryParams, setParams] = useState({ limit: 20, offset: 0, value: '' });\n const [searchedValue, setSearchedValue] = useState(null);\n const [previousOffset, setPreviousOffset] = useState(null);\n const buildSearchQuery = searchQueries[queryKey];\n const [\n getSearchResults,\n {\n loading,\n data: { search: { results, jsonResults, total } } = {\n search: { results: [], total: 0 }\n }\n }\n ] = useLazyQuery(buildSearchQuery({ resultKeys }), { ssr: false });\n // todo: remove ssr: false once this bug is resolved https://github.com/apollographql/apollo-client/issues/9108\n // without ssr: false clients can hang in ssr.\n\n const handleQueryParams = newQueryParams => {\n setParams({ ...queryParams, ...newQueryParams });\n };\n\n useEffect(\n () => {\n const { limit, offset, value } = queryParams;\n const isNewValueSet = value && value !== searchedValue;\n const isNewOffsetSet = previousOffset !== null && offset !== previousOffset;\n const parsedEntities = entities.length\n ? entities.map(entity => ({\n match: { docType: entity }\n }))\n : [];\n\n if (isNewValueSet || isNewOffsetSet) {\n getSearchResults({\n variables: {\n limit,\n offset,\n rawQuery: {\n query: {\n bool: {\n must: [\n {\n query_string: {\n query: value,\n fields,\n type: 'most_fields'\n }\n },\n {\n bool: {\n should: parsedEntities\n }\n }\n ]\n }\n }\n }\n }\n });\n setSearchedValue(value);\n setPreviousOffset(offset);\n }\n },\n [\n queryParams,\n queryParams.limit,\n queryParams.value,\n queryParams.offset,\n searchedValue,\n previousOffset,\n getSearchResults,\n entities,\n fields\n ]\n );\n\n return [\n { searchedValue: queryParams.value, loading, data: { results: results || jsonResults, total } },\n handleQueryParams\n ];\n}\n\nexport default useSearch;\n"],"file":"useSearch.js"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/application/query/index.js"],"names":["gql","SEARCH_ADMIN","SEARCH_PUBLISHED","resultKeys"],"mappings":"AAAA,
|
|
1
|
+
{"version":3,"sources":["../../../src/application/query/index.js"],"names":["gql","SEARCH_ADMIN","SEARCH_PUBLISHED","resultKeys"],"mappings":"AAAA,SAASA,GAAT,QAAoB,gBAApB;;AAEA,MAAMC,YAAY,GAAG,MAAMD,GAAI;AAC/B;AACA;AACA;AACA;AACA;AACA;AACA,CAPA;;AASA,MAAME,gBAAgB,GAAG,CAAC;AAAEC,EAAAA;AAAF,CAAD,KAAoBH,GAAI;AACjD;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,UAAUG,UAAW;AACrB;AACA;AACA;AACA;AACA,CAdA;;AAgBA,eAAe;AAAEF,EAAAA,YAAF;AAAgBC,EAAAA;AAAhB,CAAf","sourcesContent":["import { gql } from '@apollo/client';\n\nconst SEARCH_ADMIN = () => gql`\n query searchAdmin($limit: Int, $offset: Int, $sort: String, $rawQuery: JSON!) {\n search: searchAdmin(limit: $limit, offset: $offset, sort: $sort, rawQuery: $rawQuery) {\n jsonResults\n total\n }\n }\n`;\n\nconst SEARCH_PUBLISHED = ({ resultKeys }) => gql`\n query searchPublishedContent($limit: Int, $offset: Int, $sort: String, $rawQuery: JSON!) {\n search: searchPublishedContent(\n limit: $limit\n offset: $offset\n sort: $sort\n rawQuery: $rawQuery\n ) {\n results {\n ${resultKeys}\n }\n total\n }\n }\n`;\n\nexport default { SEARCH_ADMIN, SEARCH_PUBLISHED };\n"],"file":"index.js"}
|
|
@@ -5,7 +5,7 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
|
|
|
5
5
|
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
6
6
|
|
|
7
7
|
import { useState, useEffect } from 'react';
|
|
8
|
-
import { useLazyQuery } from '
|
|
8
|
+
import { useLazyQuery } from '@apollo/client';
|
|
9
9
|
import searchQueries from '../../application/query';
|
|
10
10
|
|
|
11
11
|
function useSearch({
|
|
@@ -38,7 +38,10 @@ function useSearch({
|
|
|
38
38
|
}
|
|
39
39
|
}] = useLazyQuery(buildSearchQuery({
|
|
40
40
|
resultKeys
|
|
41
|
-
})
|
|
41
|
+
}), {
|
|
42
|
+
ssr: false
|
|
43
|
+
}); // todo: remove ssr: false once this bug is resolved https://github.com/apollographql/apollo-client/issues/9108
|
|
44
|
+
// without ssr: false clients can hang in ssr.
|
|
42
45
|
|
|
43
46
|
const handleQueryParams = newQueryParams => {
|
|
44
47
|
setParams(_objectSpread(_objectSpread({}, queryParams), newQueryParams));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/components/useSearch/useSearch.js"],"names":["useState","useEffect","useLazyQuery","searchQueries","useSearch","queryKey","resultKeys","entities","fields","queryParams","setParams","limit","offset","value","searchedValue","setSearchedValue","previousOffset","setPreviousOffset","buildSearchQuery","getSearchResults","loading","data","search","results","jsonResults","total","handleQueryParams","newQueryParams","isNewValueSet","isNewOffsetSet","parsedEntities","length","map","entity","match","docType","variables","rawQuery","query","bool","must","query_string","type","should"],"mappings":";;;;;;AAAA,SAASA,QAAT,EAAmBC,SAAnB,QAAoC,OAApC;AACA,SAASC,YAAT,QAA6B,
|
|
1
|
+
{"version":3,"sources":["../../../src/components/useSearch/useSearch.js"],"names":["useState","useEffect","useLazyQuery","searchQueries","useSearch","queryKey","resultKeys","entities","fields","queryParams","setParams","limit","offset","value","searchedValue","setSearchedValue","previousOffset","setPreviousOffset","buildSearchQuery","getSearchResults","loading","data","search","results","jsonResults","total","ssr","handleQueryParams","newQueryParams","isNewValueSet","isNewOffsetSet","parsedEntities","length","map","entity","match","docType","variables","rawQuery","query","bool","must","query_string","type","should"],"mappings":"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","sourcesContent":["import { useState, useEffect } from 'react';\nimport { useLazyQuery } from '@apollo/client';\nimport searchQueries from '../../application/query';\n\nfunction useSearch({ queryKey, resultKeys, entities = [], fields }) {\n const [queryParams, setParams] = useState({ limit: 20, offset: 0, value: '' });\n const [searchedValue, setSearchedValue] = useState(null);\n const [previousOffset, setPreviousOffset] = useState(null);\n const buildSearchQuery = searchQueries[queryKey];\n const [\n getSearchResults,\n {\n loading,\n data: { search: { results, jsonResults, total } } = {\n search: { results: [], total: 0 }\n }\n }\n ] = useLazyQuery(buildSearchQuery({ resultKeys }), { ssr: false });\n // todo: remove ssr: false once this bug is resolved https://github.com/apollographql/apollo-client/issues/9108\n // without ssr: false clients can hang in ssr.\n\n const handleQueryParams = newQueryParams => {\n setParams({ ...queryParams, ...newQueryParams });\n };\n\n useEffect(\n () => {\n const { limit, offset, value } = queryParams;\n const isNewValueSet = value && value !== searchedValue;\n const isNewOffsetSet = previousOffset !== null && offset !== previousOffset;\n const parsedEntities = entities.length\n ? entities.map(entity => ({\n match: { docType: entity }\n }))\n : [];\n\n if (isNewValueSet || isNewOffsetSet) {\n getSearchResults({\n variables: {\n limit,\n offset,\n rawQuery: {\n query: {\n bool: {\n must: [\n {\n query_string: {\n query: value,\n fields,\n type: 'most_fields'\n }\n },\n {\n bool: {\n should: parsedEntities\n }\n }\n ]\n }\n }\n }\n }\n });\n setSearchedValue(value);\n setPreviousOffset(offset);\n }\n },\n [\n queryParams,\n queryParams.limit,\n queryParams.value,\n queryParams.offset,\n searchedValue,\n previousOffset,\n getSearchResults,\n entities,\n fields\n ]\n );\n\n return [\n { searchedValue: queryParams.value, loading, data: { results: results || jsonResults, total } },\n handleQueryParams\n ];\n}\n\nexport default useSearch;\n"],"file":"useSearch.js"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@blaze-cms/plugin-search-ui",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.119.0",
|
|
4
4
|
"description": "Blaze plugin search ui",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"module": "lib-es/index.js",
|
|
@@ -27,31 +27,30 @@
|
|
|
27
27
|
},
|
|
28
28
|
"license": "GPL-3.0",
|
|
29
29
|
"dependencies": {
|
|
30
|
-
"@blaze-cms/admin-ui-utils": "^0.
|
|
31
|
-
"@blaze-cms/core-errors": "^0.118.0
|
|
30
|
+
"@blaze-cms/admin-ui-utils": "^0.119.0",
|
|
31
|
+
"@blaze-cms/core-errors": "^0.118.0",
|
|
32
32
|
"@blaze-cms/setup-ui": "^0.92.0",
|
|
33
33
|
"@blaze-react/button": "0.5.19",
|
|
34
34
|
"@blaze-react/input": "0.5.30",
|
|
35
35
|
"@blaze-react/utils": "0.5.15",
|
|
36
36
|
"classnames": "^2.2.6",
|
|
37
37
|
"core-js": "^3.2.1",
|
|
38
|
-
"graphql-tag": "^2.10.1",
|
|
39
38
|
"react-icons": "^4.3.1",
|
|
40
39
|
"react-router-dom": "^5.0.1",
|
|
41
40
|
"react-tiny-virtual-list": "2.2.0"
|
|
42
41
|
},
|
|
43
42
|
"devDependencies": {
|
|
44
|
-
"@blaze-cms/core-ui": "^0.
|
|
43
|
+
"@blaze-cms/core-ui": "^0.119.0"
|
|
45
44
|
},
|
|
46
45
|
"peerDependencies": {
|
|
46
|
+
"@apollo/client": "3.x",
|
|
47
47
|
"@blaze-cms/admin": "^0.97.2",
|
|
48
48
|
"prop-types": "^15.7.2",
|
|
49
|
-
"react": "^
|
|
50
|
-
"react-apollo": "^3.1.1"
|
|
49
|
+
"react": "^17.0.2"
|
|
51
50
|
},
|
|
52
51
|
"eslintIgnore": [
|
|
53
52
|
"lib/*",
|
|
54
53
|
"lib-es/*"
|
|
55
54
|
],
|
|
56
|
-
"gitHead": "
|
|
55
|
+
"gitHead": "2bbdbff965c620190bc67b5bae4b210041d44c0f"
|
|
57
56
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { useState, useEffect } from 'react';
|
|
2
|
-
import { useLazyQuery } from '
|
|
2
|
+
import { useLazyQuery } from '@apollo/client';
|
|
3
3
|
import searchQueries from '../../application/query';
|
|
4
4
|
|
|
5
5
|
function useSearch({ queryKey, resultKeys, entities = [], fields }) {
|
|
@@ -15,7 +15,9 @@ function useSearch({ queryKey, resultKeys, entities = [], fields }) {
|
|
|
15
15
|
search: { results: [], total: 0 }
|
|
16
16
|
}
|
|
17
17
|
}
|
|
18
|
-
] = useLazyQuery(buildSearchQuery({ resultKeys }));
|
|
18
|
+
] = useLazyQuery(buildSearchQuery({ resultKeys }), { ssr: false });
|
|
19
|
+
// todo: remove ssr: false once this bug is resolved https://github.com/apollographql/apollo-client/issues/9108
|
|
20
|
+
// without ssr: false clients can hang in ssr.
|
|
19
21
|
|
|
20
22
|
const handleQueryParams = newQueryParams => {
|
|
21
23
|
setParams({ ...queryParams, ...newQueryParams });
|