@blaze-cms/plugin-search-ui 0.128.0-admin-updates.0 → 0.128.0-core-styles.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (58) hide show
  1. package/CHANGELOG.md +2 -18
  2. package/lib/application/query/index.js.map +1 -1
  3. package/lib/components/SearchAdmin/RecentSearches/RecentSearches.js.map +1 -1
  4. package/lib/components/SearchAdmin/RecentSearches/index.js.map +1 -1
  5. package/lib/components/SearchAdmin/SearchAdmin.js +12 -57
  6. package/lib/components/SearchAdmin/SearchAdmin.js.map +1 -1
  7. package/lib/components/SearchAdmin/SearchBar/SearchBar.js.map +1 -1
  8. package/lib/components/SearchAdmin/SearchBar/index.js.map +1 -1
  9. package/lib/components/SearchAdmin/SearchResults/SearchResults.js +6 -18
  10. package/lib/components/SearchAdmin/SearchResults/SearchResults.js.map +1 -1
  11. package/lib/components/SearchAdmin/SearchResults/index.js.map +1 -1
  12. package/lib/components/SearchAdmin/TriggerModal/TriggerModal.js.map +1 -1
  13. package/lib/components/SearchAdmin/TriggerModal/index.js.map +1 -1
  14. package/lib/components/SearchAdmin/index.js.map +1 -1
  15. package/lib/components/SearchPublishedContent/SearchPublishedContent.js.map +1 -1
  16. package/lib/components/SearchPublishedContent/index.js.map +1 -1
  17. package/lib/components/useLocalStorage/index.js.map +1 -1
  18. package/lib/components/useLocalStorage/useLocalStorage.js.map +1 -1
  19. package/lib/components/useSearch/index.js.map +1 -1
  20. package/lib/components/useSearch/useSearch.js +5 -11
  21. package/lib/components/useSearch/useSearch.js.map +1 -1
  22. package/lib/components/useSearchResults/index.js.map +1 -1
  23. package/lib/components/useSearchResults/useSearchResults.js +19 -1
  24. package/lib/components/useSearchResults/useSearchResults.js.map +1 -1
  25. package/lib/constants.js.map +1 -1
  26. package/lib/hooks/index.js.map +1 -1
  27. package/lib/hooks/useDebounceSearch.js.map +1 -1
  28. package/lib/index.js.map +1 -1
  29. package/lib-es/application/query/index.js.map +1 -1
  30. package/lib-es/components/SearchAdmin/RecentSearches/RecentSearches.js.map +1 -1
  31. package/lib-es/components/SearchAdmin/SearchAdmin.js +3 -31
  32. package/lib-es/components/SearchAdmin/SearchAdmin.js.map +1 -1
  33. package/lib-es/components/SearchAdmin/SearchBar/SearchBar.js.map +1 -1
  34. package/lib-es/components/SearchAdmin/SearchResults/SearchResults.js +6 -18
  35. package/lib-es/components/SearchAdmin/SearchResults/SearchResults.js.map +1 -1
  36. package/lib-es/components/SearchAdmin/TriggerModal/TriggerModal.js.map +1 -1
  37. package/lib-es/components/SearchPublishedContent/SearchPublishedContent.js.map +1 -1
  38. package/lib-es/components/useLocalStorage/useLocalStorage.js.map +1 -1
  39. package/lib-es/components/useSearch/useSearch.js +2 -5
  40. package/lib-es/components/useSearch/useSearch.js.map +1 -1
  41. package/lib-es/components/useSearchResults/useSearchResults.js +11 -1
  42. package/lib-es/components/useSearchResults/useSearchResults.js.map +1 -1
  43. package/lib-es/hooks/useDebounceSearch.js.map +1 -1
  44. package/package.json +6 -6
  45. package/src/components/SearchAdmin/SearchAdmin.js +40 -70
  46. package/src/components/SearchAdmin/SearchResults/SearchResults.js +6 -42
  47. package/src/components/useSearch/useSearch.js +2 -8
  48. package/src/components/useSearchResults/useSearchResults.js +15 -1
  49. package/lib/components/SearchAdmin/SearchAdminSideBar/SearchAdminSideBar.js +0 -113
  50. package/lib/components/SearchAdmin/SearchAdminSideBar/SearchAdminSideBar.js.map +0 -1
  51. package/lib/components/SearchAdmin/SearchAdminSideBar/index.js +0 -12
  52. package/lib/components/SearchAdmin/SearchAdminSideBar/index.js.map +0 -1
  53. package/lib-es/components/SearchAdmin/SearchAdminSideBar/SearchAdminSideBar.js +0 -76
  54. package/lib-es/components/SearchAdmin/SearchAdminSideBar/SearchAdminSideBar.js.map +0 -1
  55. package/lib-es/components/SearchAdmin/SearchAdminSideBar/index.js +0 -3
  56. package/lib-es/components/SearchAdmin/SearchAdminSideBar/index.js.map +0 -1
  57. package/src/components/SearchAdmin/SearchAdminSideBar/SearchAdminSideBar.js +0 -88
  58. package/src/components/SearchAdmin/SearchAdminSideBar/index.js +0 -3
@@ -1 +1 @@
1
- {"version":3,"file":"useSearch.js","names":["useState","useEffect","useLazyQuery","searchQueries","useSearch","queryKey","resultKeys","entities","fields","queryParams","setParams","limit","offset","value","searchedValue","setSearchedValue","en","setEn","previousOffset","setPreviousOffset","buildSearchQuery","getSearchResults","loading","data","search","results","jsonResults","total","ssr","handleQueryParams","newQueryParams","isNewValueSet","isNewOffsetSet","notSameLength","length","parsedEntities","map","entity","match","docType","variables","rawQuery","query","bool","must","query_string","type","default_operator","should"],"sources":["../../../src/components/useSearch/useSearch.js"],"sourcesContent":["import { useState, useEffect } from 'react';\nimport { useLazyQuery } from '@apollo/client';\nimport searchQueries from '../../application/query';\n\nfunction useSearch({ queryKey, resultKeys, entities = [], fields }) {\n const [queryParams, setParams] = useState({ limit: 20, offset: 0, value: '' });\n const [searchedValue, setSearchedValue] = useState(null);\n const [en, setEn] = useState([]);\n const [previousOffset, setPreviousOffset] = useState(null);\n\n const buildSearchQuery = searchQueries[queryKey];\n const [\n getSearchResults,\n {\n loading,\n data: { search: { results, jsonResults, total } } = {\n search: { results: [], total: 0 }\n }\n }\n ] = useLazyQuery(buildSearchQuery({ resultKeys }), { ssr: false });\n // todo: remove ssr: false once this bug is resolved https://github.com/apollographql/apollo-client/issues/9108\n // without ssr: false clients can hang in ssr.\n\n const handleQueryParams = newQueryParams => {\n setParams({ ...queryParams, ...newQueryParams });\n };\n\n useEffect(\n () => {\n const { limit, offset, value } = queryParams;\n const isNewValueSet = value && value !== searchedValue;\n const isNewOffsetSet = previousOffset !== null && offset !== previousOffset;\n const notSameLength = en.length !== entities.length;\n const parsedEntities = entities.length\n ? entities.map(entity => ({\n match: { docType: entity }\n }))\n : [];\n\n if (isNewValueSet || isNewOffsetSet || notSameLength) {\n getSearchResults({\n variables: {\n limit,\n offset,\n rawQuery: {\n query: {\n bool: {\n must: [\n {\n query_string: {\n query: value,\n fields,\n type: 'most_fields',\n default_operator: 'AND'\n }\n },\n {\n bool: {\n should: parsedEntities\n }\n }\n ]\n }\n }\n }\n }\n });\n setSearchedValue(value);\n setPreviousOffset(offset);\n setEn(entities);\n }\n },\n [\n queryParams,\n queryParams.limit,\n queryParams.value,\n queryParams.offset,\n searchedValue,\n previousOffset,\n getSearchResults,\n entities,\n fields,\n entities.length,\n en.length\n ]\n );\n\n return [\n { searchedValue: queryParams.value, loading, data: { results: results || jsonResults, total } },\n handleQueryParams\n ];\n}\n\nexport default useSearch;\n"],"mappings":"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"}
1
+ {"version":3,"file":"useSearch.js","names":["useState","useEffect","useLazyQuery","searchQueries","useSearch","queryKey","resultKeys","entities","fields","queryParams","setParams","limit","offset","value","searchedValue","setSearchedValue","previousOffset","setPreviousOffset","buildSearchQuery","getSearchResults","loading","data","search","results","jsonResults","total","ssr","handleQueryParams","newQueryParams","_objectSpread","isNewValueSet","isNewOffsetSet","parsedEntities","length","map","entity","match","docType","variables","rawQuery","query","bool","must","query_string","type","default_operator","should"],"sources":["../../../src/components/useSearch/useSearch.js"],"sourcesContent":["import { useState, useEffect } from 'react';\nimport { useLazyQuery } from '@apollo/client';\nimport searchQueries from '../../application/query';\n\nfunction useSearch({ queryKey, resultKeys, entities = [], fields }) {\n const [queryParams, setParams] = useState({ limit: 20, offset: 0, value: '' });\n const [searchedValue, setSearchedValue] = useState(null);\n const [previousOffset, setPreviousOffset] = useState(null);\n const buildSearchQuery = searchQueries[queryKey];\n const [\n getSearchResults,\n {\n loading,\n data: { search: { results, jsonResults, total } } = {\n search: { results: [], total: 0 }\n }\n }\n ] = useLazyQuery(buildSearchQuery({ resultKeys }), { ssr: false });\n // todo: remove ssr: false once this bug is resolved https://github.com/apollographql/apollo-client/issues/9108\n // without ssr: false clients can hang in ssr.\n\n const handleQueryParams = newQueryParams => {\n setParams({ ...queryParams, ...newQueryParams });\n };\n\n useEffect(\n () => {\n const { limit, offset, value } = queryParams;\n const isNewValueSet = value && value !== searchedValue;\n const isNewOffsetSet = previousOffset !== null && offset !== previousOffset;\n const parsedEntities = entities.length\n ? entities.map(entity => ({\n match: { docType: entity }\n }))\n : [];\n\n if (isNewValueSet || isNewOffsetSet) {\n getSearchResults({\n variables: {\n limit,\n offset,\n rawQuery: {\n query: {\n bool: {\n must: [\n {\n query_string: {\n query: value,\n fields,\n type: 'most_fields',\n default_operator: 'AND'\n }\n },\n {\n bool: {\n should: parsedEntities\n }\n }\n ]\n }\n }\n }\n }\n });\n setSearchedValue(value);\n setPreviousOffset(offset);\n }\n },\n [\n queryParams,\n queryParams.limit,\n queryParams.value,\n queryParams.offset,\n searchedValue,\n previousOffset,\n getSearchResults,\n entities,\n fields\n ]\n );\n\n return [\n { searchedValue: queryParams.value, loading, data: { results: results || jsonResults, total } },\n handleQueryParams\n ];\n}\n\nexport default useSearch;\n"],"mappings":"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"}
@@ -1,6 +1,7 @@
1
1
  import _defineProperty from "@babel/runtime/helpers/defineProperty";
2
2
  function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
3
3
  function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
4
+ import { useState, useEffect } from 'react';
4
5
  import useSearch from '../useSearch';
5
6
  function useSearchResults({
6
7
  queryKey,
@@ -21,7 +22,16 @@ function useSearchResults({
21
22
  entities,
22
23
  fields
23
24
  });
25
+ const [currentResults, setCurrentResults] = useState([]);
26
+ const [allResults, setAllResults] = useState([]);
27
+ useEffect(() => {
28
+ if (currentResults.length !== results.length) {
29
+ setAllResults([...allResults, ...results]);
30
+ setCurrentResults(results);
31
+ }
32
+ }, [allResults, currentResults, currentResults.length, results]);
24
33
  const clearList = params => {
34
+ setAllResults([]);
25
35
  setParams(_objectSpread(_objectSpread({}, params), {}, {
26
36
  offset: 0
27
37
  }));
@@ -31,7 +41,7 @@ function useSearchResults({
31
41
  };
32
42
  return [{
33
43
  loading,
34
- results,
44
+ results: allResults,
35
45
  total
36
46
  }, setQueryParams];
37
47
  }
@@ -1 +1 @@
1
- {"version":3,"file":"useSearchResults.js","names":["useSearch","useSearchResults","queryKey","resultKeys","entities","fields","searchedValue","loading","data","results","total","setParams","clearList","params","offset","setQueryParams","value"],"sources":["../../../src/components/useSearchResults/useSearchResults.js"],"sourcesContent":["import useSearch from '../useSearch';\n\nfunction useSearchResults({ queryKey, resultKeys, entities, fields }) {\n const [\n {\n searchedValue,\n loading,\n data: { results, total }\n },\n setParams\n ] = useSearch({ queryKey, resultKeys, entities, fields });\n\n const clearList = params => {\n setParams({ ...params, offset: 0 });\n };\n\n const setQueryParams = params => {\n params.value !== searchedValue ? clearList(params) : setParams(params);\n };\n\n return [{ loading, results, total }, setQueryParams];\n}\n\nexport default useSearchResults;\n"],"mappings":";;;AAAA,OAAOA,SAAS,MAAM,cAAc;AAEpC,SAASC,gBAAgB,CAAC;EAAEC,QAAQ;EAAEC,UAAU;EAAEC,QAAQ;EAAEC;AAAO,CAAC,EAAE;EACpE,MAAM,CACJ;IACEC,aAAa;IACbC,OAAO;IACPC,IAAI,EAAE;MAAEC,OAAO;MAAEC;IAAM;EACzB,CAAC,EACDC,SAAS,CACV,GAAGX,SAAS,CAAC;IAAEE,QAAQ;IAAEC,UAAU;IAAEC,QAAQ;IAAEC;EAAO,CAAC,CAAC;EAEzD,MAAMO,SAAS,GAAGC,MAAM,IAAI;IAC1BF,SAAS,iCAAME,MAAM;MAAEC,MAAM,EAAE;IAAC,GAAG;EACrC,CAAC;EAED,MAAMC,cAAc,GAAGF,MAAM,IAAI;IAC/BA,MAAM,CAACG,KAAK,KAAKV,aAAa,GAAGM,SAAS,CAACC,MAAM,CAAC,GAAGF,SAAS,CAACE,MAAM,CAAC;EACxE,CAAC;EAED,OAAO,CAAC;IAAEN,OAAO;IAAEE,OAAO;IAAEC;EAAM,CAAC,EAAEK,cAAc,CAAC;AACtD;AAEA,eAAed,gBAAgB"}
1
+ {"version":3,"file":"useSearchResults.js","names":["useState","useEffect","useSearch","useSearchResults","queryKey","resultKeys","entities","fields","searchedValue","loading","data","results","total","setParams","currentResults","setCurrentResults","allResults","setAllResults","length","clearList","params","_objectSpread","offset","setQueryParams","value"],"sources":["../../../src/components/useSearchResults/useSearchResults.js"],"sourcesContent":["import { useState, useEffect } from 'react';\nimport useSearch from '../useSearch';\n\nfunction useSearchResults({ queryKey, resultKeys, entities, fields }) {\n const [\n {\n searchedValue,\n loading,\n data: { results, total }\n },\n setParams\n ] = useSearch({ queryKey, resultKeys, entities, fields });\n const [currentResults, setCurrentResults] = useState([]);\n const [allResults, setAllResults] = useState([]);\n\n useEffect(\n () => {\n if (currentResults.length !== results.length) {\n setAllResults([...allResults, ...results]);\n setCurrentResults(results);\n }\n },\n [allResults, currentResults, currentResults.length, results]\n );\n\n const clearList = params => {\n setAllResults([]);\n setParams({ ...params, offset: 0 });\n };\n\n const setQueryParams = params => {\n params.value !== searchedValue ? clearList(params) : setParams(params);\n };\n\n return [{ loading, results: allResults, total }, setQueryParams];\n}\n\nexport default useSearchResults;\n"],"mappings":";;;AAAA,SAASA,QAAQ,EAAEC,SAAS,QAAQ,OAAO;AAC3C,OAAOC,SAAS,MAAM,cAAc;AAEpC,SAASC,gBAAgBA,CAAC;EAAEC,QAAQ;EAAEC,UAAU;EAAEC,QAAQ;EAAEC;AAAO,CAAC,EAAE;EACpE,MAAM,CACJ;IACEC,aAAa;IACbC,OAAO;IACPC,IAAI,EAAE;MAAEC,OAAO;MAAEC;IAAM;EACzB,CAAC,EACDC,SAAS,CACV,GAAGX,SAAS,CAAC;IAAEE,QAAQ;IAAEC,UAAU;IAAEC,QAAQ;IAAEC;EAAO,CAAC,CAAC;EACzD,MAAM,CAACO,cAAc,EAAEC,iBAAiB,CAAC,GAAGf,QAAQ,CAAC,EAAE,CAAC;EACxD,MAAM,CAACgB,UAAU,EAAEC,aAAa,CAAC,GAAGjB,QAAQ,CAAC,EAAE,CAAC;EAEhDC,SAAS,CACP,MAAM;IACJ,IAAIa,cAAc,CAACI,MAAM,KAAKP,OAAO,CAACO,MAAM,EAAE;MAC5CD,aAAa,CAAC,CAAC,GAAGD,UAAU,EAAE,GAAGL,OAAO,CAAC,CAAC;MAC1CI,iBAAiB,CAACJ,OAAO,CAAC;IAC5B;EACF,CAAC,EACD,CAACK,UAAU,EAAEF,cAAc,EAAEA,cAAc,CAACI,MAAM,EAAEP,OAAO,CAAC,CAC7D;EAED,MAAMQ,SAAS,GAAGC,MAAM,IAAI;IAC1BH,aAAa,CAAC,EAAE,CAAC;IACjBJ,SAAS,CAAAQ,aAAA,CAAAA,aAAA,KAAMD,MAAM;MAAEE,MAAM,EAAE;IAAC,GAAG;EACrC,CAAC;EAED,MAAMC,cAAc,GAAGH,MAAM,IAAI;IAC/BA,MAAM,CAACI,KAAK,KAAKhB,aAAa,GAAGW,SAAS,CAACC,MAAM,CAAC,GAAGP,SAAS,CAACO,MAAM,CAAC;EACxE,CAAC;EAED,OAAO,CAAC;IAAEX,OAAO;IAAEE,OAAO,EAAEK,UAAU;IAAEJ;EAAM,CAAC,EAAEW,cAAc,CAAC;AAClE;AAEA,eAAepB,gBAAgB"}
@@ -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 () => {\n if (debouncedSearchTerm && debouncedSearchTerm !== previousSearchTerm) {\n setQueryParams({ value: debouncedSearchTerm });\n setPreviousSearchTerm(debouncedSearchTerm);\n }\n },\n [debouncedSearchTerm, previousSearchTerm, setQueryParams]\n );\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,GAAG,CAAC;EAAEC,QAAQ;EAAEC,UAAU;EAAEC,MAAM;EAAEC;AAAkB,CAAC,KAAK;EACjF,MAAM,CAACC,UAAU,EAAEC,aAAa,CAAC,GAAGV,QAAQ,CAACQ,iBAAiB,aAAjBA,iBAAiB,cAAjBA,iBAAiB,GAAI,EAAE,CAAC;EACrE,MAAM,CAACG,kBAAkB,EAAEC,qBAAqB,CAAC,GAAGZ,QAAQ,CAAC,IAAI,CAAC;EAClE,MAAMa,mBAAmB,GAAGZ,WAAW,CAACQ,UAAU,EAAE,GAAG,CAAC;EAExD,MAAM,CAAC;IAAEK,OAAO;IAAEC;EAAQ,CAAC,EAAEC,cAAc,CAAC,GAAGd,gBAAgB,CAAC;IAC9De,QAAQ,EAAEd,gBAAgB;IAC1BG,UAAU;IACVD,QAAQ;IACRE;EACF,CAAC,CAAC;EAEFR,SAAS,CACP,MAAM;IACJ,IAAIc,mBAAmB,IAAIA,mBAAmB,KAAKF,kBAAkB,EAAE;MACrEK,cAAc,CAAC;QAAEE,KAAK,EAAEL;MAAoB,CAAC,CAAC;MAC9CD,qBAAqB,CAACC,mBAAmB,CAAC;IAC5C;EACF,CAAC,EACD,CAACA,mBAAmB,EAAEF,kBAAkB,EAAEK,cAAc,CAAC,CAC1D;EAED,OAAO;IACLF,OAAO;IACPC,OAAO;IACPN,UAAU;IACVC,aAAa;IACbE,qBAAqB;IACrBC,mBAAmB;IACnBF;EACF,CAAC;AACH,CAAC;AAED,eAAeP,iBAAiB"}
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 () => {\n if (debouncedSearchTerm && debouncedSearchTerm !== previousSearchTerm) {\n setQueryParams({ value: debouncedSearchTerm });\n setPreviousSearchTerm(debouncedSearchTerm);\n }\n },\n [debouncedSearchTerm, previousSearchTerm, setQueryParams]\n );\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;AAAkB,CAAC,KAAK;EACjF,MAAM,CAACC,UAAU,EAAEC,aAAa,CAAC,GAAGV,QAAQ,CAACQ,iBAAiB,aAAjBA,iBAAiB,cAAjBA,iBAAiB,GAAI,EAAE,CAAC;EACrE,MAAM,CAACG,kBAAkB,EAAEC,qBAAqB,CAAC,GAAGZ,QAAQ,CAAC,IAAI,CAAC;EAClE,MAAMa,mBAAmB,GAAGZ,WAAW,CAACQ,UAAU,EAAE,GAAG,CAAC;EAExD,MAAM,CAAC;IAAEK,OAAO;IAAEC;EAAQ,CAAC,EAAEC,cAAc,CAAC,GAAGd,gBAAgB,CAAC;IAC9De,QAAQ,EAAEd,gBAAgB;IAC1BG,UAAU;IACVD,QAAQ;IACRE;EACF,CAAC,CAAC;EAEFR,SAAS,CACP,MAAM;IACJ,IAAIc,mBAAmB,IAAIA,mBAAmB,KAAKF,kBAAkB,EAAE;MACrEK,cAAc,CAAC;QAAEE,KAAK,EAAEL;MAAoB,CAAC,CAAC;MAC9CD,qBAAqB,CAACC,mBAAmB,CAAC;IAC5C;EACF,CAAC,EACD,CAACA,mBAAmB,EAAEF,kBAAkB,EAAEK,cAAc,CAAC,CAC1D;EAED,OAAO;IACLF,OAAO;IACPC,OAAO;IACPN,UAAU;IACVC,aAAa;IACbE,qBAAqB;IACrBC,mBAAmB;IACnBF;EACF,CAAC;AACH,CAAC;AAED,eAAeP,iBAAiB"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@blaze-cms/plugin-search-ui",
3
- "version": "0.128.0-admin-updates.0",
3
+ "version": "0.128.0-core-styles.0",
4
4
  "description": "Blaze plugin search ui",
5
5
  "main": "lib/index.js",
6
6
  "module": "lib-es/index.js",
@@ -27,9 +27,9 @@
27
27
  },
28
28
  "license": "GPL-3.0",
29
29
  "dependencies": {
30
- "@blaze-cms/admin-ui-utils": "0.128.0-admin-updates.0",
31
- "@blaze-cms/core-errors": "0.128.0-admin-updates.0",
32
- "@blaze-cms/setup-ui": "0.128.0-admin-updates.0",
30
+ "@blaze-cms/admin-ui-utils": "0.128.0-core-styles.0",
31
+ "@blaze-cms/core-errors": "^0.127.0",
32
+ "@blaze-cms/setup-ui": "0.128.0-core-styles.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",
@@ -40,7 +40,7 @@
40
40
  "react-tiny-virtual-list": "2.2.0"
41
41
  },
42
42
  "devDependencies": {
43
- "@blaze-cms/core-ui": "0.128.0-admin-updates.0"
43
+ "@blaze-cms/core-ui": "0.128.0-core-styles.0"
44
44
  },
45
45
  "peerDependencies": {
46
46
  "@apollo/client": "3.x",
@@ -52,5 +52,5 @@
52
52
  "lib/*",
53
53
  "lib-es/*"
54
54
  ],
55
- "gitHead": "ad3389e954fe463366655311efb1198191dbb625"
55
+ "gitHead": "91cbf4e36ff8860f2e2ef140ee6e132fe2cbf0f6"
56
56
  }
@@ -1,28 +1,21 @@
1
1
  import React, { useState, useRef, useEffect } from 'react';
2
2
  import classnames from 'classnames';
3
- import { useDebounce } from '@blaze-react/utils/lib/customHooks';
4
3
  import useLocalStorage from '../useLocalStorage';
5
4
  import SearchBar from './SearchBar';
6
5
  import RecentSearches from './RecentSearches';
7
6
  import SearchResults from './SearchResults';
8
7
  import TriggerModal from './TriggerModal';
9
- import SearchAdminSideBar from './SearchAdminSideBar';
10
8
  import useSearchResults from '../useSearchResults';
11
9
  import { SEARCH_ADMIN } from '../../constants';
12
10
 
13
11
  const SearchAdmin = () => {
14
12
  const [searchTerm, setSearchTerm] = useState('');
15
- const [openSearchSideBar, setOpenSearchSideBar] = useState(true);
16
- const [entityValues, setEntityValues] = useState([]);
17
-
18
13
  const [recentSearches, setRecentSearches] = useLocalStorage('recentSearches', []);
19
14
  const [displaySearchModalFrame, setDisplaySearchModalFrame] = useState(false);
20
15
  const [enableResults, setEnableResults] = useState(true);
21
16
  const searchInputRef = useRef(null);
22
- const debouncedEntityValues = useDebounce(entityValues, 500);
23
17
  const [{ loading, results, total }, setQueryParams] = useSearchResults({
24
- queryKey: SEARCH_ADMIN,
25
- entities: debouncedEntityValues.map(e => e.id)
18
+ queryKey: SEARCH_ADMIN
26
19
  });
27
20
 
28
21
  useEffect(
@@ -75,10 +68,6 @@ const SearchAdmin = () => {
75
68
  'modal--show': displaySearchModalFrame
76
69
  });
77
70
 
78
- const searchModalSideBarClassName = classnames('modal__search__sidebar', {
79
- 'modal__search__sidebar--close': !openSearchSideBar
80
- });
81
-
82
71
  const isEmptySearchTermAndData = !searchTerm && !results.length;
83
72
  const isEmptySearchTermnAndDisabledResults = !searchTerm && !enableResults;
84
73
  const shouldDisplayRecentSearches =
@@ -86,70 +75,51 @@ const SearchAdmin = () => {
86
75
 
87
76
  const showResults = enableResults && results.length;
88
77
 
89
- const handleSetEntityValues = newEntity => {
90
- const entityExists = entityValues.some(entity => entity.id === newEntity.id);
91
- if (entityExists) {
92
- setEntityValues(entityValues.filter(entity => entity.id !== newEntity.id));
93
- } else {
94
- setEntityValues([...entityValues, newEntity]);
95
- }
96
- };
97
-
98
78
  return (
99
79
  <div className="search search--header">
100
80
  <TriggerModal toggleSearchModal={toggleSearchModal} />
101
81
  <div className={searchModalResultsClassName}>
102
82
  {displaySearchModalFrame && (
103
- <div className="modal__search">
104
- <SearchAdminSideBar
105
- searchModalSideBarClassName={searchModalSideBarClassName}
106
- openSearchSideBar={openSearchSideBar}
107
- setOpenSearchSideBar={setOpenSearchSideBar}
108
- handleSetEntityValues={handleSetEntityValues}
109
- entityValues={entityValues}
110
- setEntityValues={setEntityValues}
111
- />
112
- <div className="modal__search__content">
113
- <div className="modal__header modal__header--search">
114
- <SearchBar
115
- toggleSearchModal={toggleSearchModal}
116
- handleKeyDown={handleKeyDown}
117
- searchInputRef={searchInputRef}
118
- handleSearchTerm={handleSearchTerm}
119
- searchTerm={searchTerm}
120
- search={() => search({ value: searchTerm })}
121
- />
122
- </div>
123
- {shouldDisplayRecentSearches ? (
124
- <RecentSearches
125
- recentSearches={recentSearches}
126
- handleSearchTerm={handleSearchTerm}
127
- search={search}
128
- />
129
- ) : (
130
- <>
131
- {!showResults && (
132
- <div className="list list--search">
133
- <div className="header header--list">
134
- <h2>No Results</h2>
135
- </div>
136
- </div>
137
- )}
138
- </>
139
- )}
140
- {showResults && (
141
- <SearchResults
142
- currentValue={searchTerm}
143
- searchTerm={searchTerm}
144
- loading={loading}
145
- results={results}
146
- total={total}
147
- setQueryParams={setQueryParams}
148
- closeModal={toggleSearchModal}
149
- />
150
- )}
83
+ <>
84
+ <div className="modal__header modal__header--search">
85
+ <SearchBar
86
+ toggleSearchModal={toggleSearchModal}
87
+ handleKeyDown={handleKeyDown}
88
+ searchInputRef={searchInputRef}
89
+ handleSearchTerm={handleSearchTerm}
90
+ searchTerm={searchTerm}
91
+ search={() => search({ value: searchTerm })}
92
+ />
151
93
  </div>
152
- </div>
94
+ {shouldDisplayRecentSearches ? (
95
+ <RecentSearches
96
+ recentSearches={recentSearches}
97
+ handleSearchTerm={handleSearchTerm}
98
+ search={search}
99
+ />
100
+ ) : (
101
+ <>
102
+ {!showResults && (
103
+ <div className="list list--search">
104
+ <div className="header header--list">
105
+ <h2>No Results</h2>
106
+ </div>
107
+ </div>
108
+ )}
109
+ </>
110
+ )}
111
+ {showResults && (
112
+ <SearchResults
113
+ currentValue={searchTerm}
114
+ searchTerm={searchTerm}
115
+ loading={loading}
116
+ results={results}
117
+ total={total}
118
+ setQueryParams={setQueryParams}
119
+ closeModal={toggleSearchModal}
120
+ />
121
+ )}
122
+ </>
153
123
  )}
154
124
  </div>
155
125
  </div>
@@ -54,9 +54,7 @@ const SearchResults = ({
54
54
  {loading && <span>Loading...</span>}
55
55
  <div className="modal__content modal__content--search">
56
56
  <div className="header header--list">
57
- <h2 className="header--list--results">
58
- About <b>{total}</b> search keywords results
59
- </h2>
57
+ <h2>{total} results</h2>
60
58
  </div>
61
59
  <VirtualList
62
60
  width="100%"
@@ -67,24 +65,15 @@ const SearchResults = ({
67
65
  scrollToIndex={currentIndex}
68
66
  onItemsRendered={handleRenderedItems}
69
67
  renderItem={({ index, style }) => {
70
- const {
71
- id,
72
- docType,
73
- updated,
74
- name,
75
- entityIdentifier,
76
- published,
77
- created,
78
- status
79
- } = results[index];
68
+ const { id, docType, updated, name } = results[index];
80
69
  const updatedDate = updated ? getDateFormat(updated) : null;
81
- const createdDate = created ? getDateFormat(created) : null;
82
- const publishedDate = published ? getDateFormat(published) : null;
83
70
  return (
84
71
  <div key={index} style={style} className="list__item--resultWrapper">
85
72
  <div className="list__item list__item--result">
86
73
  <div className="list__item-row list__item-row--result">
87
- <span className="list__item-identifier">{entityIdentifier}</span>
74
+ <span className="badge badge--primary">
75
+ {docType} {updatedDate}
76
+ </span>
88
77
  <a
89
78
  href={getNavigationRoute({
90
79
  id,
@@ -96,34 +85,9 @@ const SearchResults = ({
96
85
  docType
97
86
  })
98
87
  }
99
- className="list__item-link">
88
+ className="list__item-text list__item-text--result">
100
89
  {name}
101
90
  </a>
102
-
103
- <div className="list__item-dates">
104
- {publishedDate && (
105
- <span>
106
- <b>Published: </b>
107
- {publishedDate}
108
- </span>
109
- )}
110
- <span>
111
- <b>Created: </b>
112
- {createdDate}
113
- </span>
114
- <span>
115
- <b>Updated: </b>
116
- {updatedDate}
117
- </span>
118
- </div>
119
- <div className="list__item-status">
120
- {status && (
121
- <span>
122
- <b>Status: </b>
123
- {status}
124
- </span>
125
- )}
126
- </div>
127
91
  </div>
128
92
  </div>
129
93
  </div>
@@ -5,9 +5,7 @@ import searchQueries from '../../application/query';
5
5
  function useSearch({ queryKey, resultKeys, entities = [], fields }) {
6
6
  const [queryParams, setParams] = useState({ limit: 20, offset: 0, value: '' });
7
7
  const [searchedValue, setSearchedValue] = useState(null);
8
- const [en, setEn] = useState([]);
9
8
  const [previousOffset, setPreviousOffset] = useState(null);
10
-
11
9
  const buildSearchQuery = searchQueries[queryKey];
12
10
  const [
13
11
  getSearchResults,
@@ -30,14 +28,13 @@ function useSearch({ queryKey, resultKeys, entities = [], fields }) {
30
28
  const { limit, offset, value } = queryParams;
31
29
  const isNewValueSet = value && value !== searchedValue;
32
30
  const isNewOffsetSet = previousOffset !== null && offset !== previousOffset;
33
- const notSameLength = en.length !== entities.length;
34
31
  const parsedEntities = entities.length
35
32
  ? entities.map(entity => ({
36
33
  match: { docType: entity }
37
34
  }))
38
35
  : [];
39
36
 
40
- if (isNewValueSet || isNewOffsetSet || notSameLength) {
37
+ if (isNewValueSet || isNewOffsetSet) {
41
38
  getSearchResults({
42
39
  variables: {
43
40
  limit,
@@ -67,7 +64,6 @@ function useSearch({ queryKey, resultKeys, entities = [], fields }) {
67
64
  });
68
65
  setSearchedValue(value);
69
66
  setPreviousOffset(offset);
70
- setEn(entities);
71
67
  }
72
68
  },
73
69
  [
@@ -79,9 +75,7 @@ function useSearch({ queryKey, resultKeys, entities = [], fields }) {
79
75
  previousOffset,
80
76
  getSearchResults,
81
77
  entities,
82
- fields,
83
- entities.length,
84
- en.length
78
+ fields
85
79
  ]
86
80
  );
87
81
 
@@ -1,3 +1,4 @@
1
+ import { useState, useEffect } from 'react';
1
2
  import useSearch from '../useSearch';
2
3
 
3
4
  function useSearchResults({ queryKey, resultKeys, entities, fields }) {
@@ -9,8 +10,21 @@ function useSearchResults({ queryKey, resultKeys, entities, fields }) {
9
10
  },
10
11
  setParams
11
12
  ] = useSearch({ queryKey, resultKeys, entities, fields });
13
+ const [currentResults, setCurrentResults] = useState([]);
14
+ const [allResults, setAllResults] = useState([]);
15
+
16
+ useEffect(
17
+ () => {
18
+ if (currentResults.length !== results.length) {
19
+ setAllResults([...allResults, ...results]);
20
+ setCurrentResults(results);
21
+ }
22
+ },
23
+ [allResults, currentResults, currentResults.length, results]
24
+ );
12
25
 
13
26
  const clearList = params => {
27
+ setAllResults([]);
14
28
  setParams({ ...params, offset: 0 });
15
29
  };
16
30
 
@@ -18,7 +32,7 @@ function useSearchResults({ queryKey, resultKeys, entities, fields }) {
18
32
  params.value !== searchedValue ? clearList(params) : setParams(params);
19
33
  };
20
34
 
21
- return [{ loading, results, total }, setQueryParams];
35
+ return [{ loading, results: allResults, total }, setQueryParams];
22
36
  }
23
37
 
24
38
  export default useSearchResults;
@@ -1,113 +0,0 @@
1
- "use strict";
2
-
3
- require("core-js/modules/es.array.iterator.js");
4
- require("core-js/modules/es.string.iterator.js");
5
- require("core-js/modules/es.weak-map.js");
6
- require("core-js/modules/web.dom-collections.iterator.js");
7
- require("core-js/modules/es.object.define-property.js");
8
- require("core-js/modules/es.object.get-own-property-descriptor.js");
9
- var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
10
- var _typeof = require("@babel/runtime/helpers/typeof");
11
- Object.defineProperty(exports, "__esModule", {
12
- value: true
13
- });
14
- exports["default"] = void 0;
15
- require("core-js/modules/es.array.filter.js");
16
- require("core-js/modules/es.object.to-string.js");
17
- require("core-js/modules/es.object.keys.js");
18
- require("core-js/modules/es.array.includes.js");
19
- require("core-js/modules/es.string.includes.js");
20
- require("core-js/modules/es.array.slice.js");
21
- require("core-js/modules/es.array.map.js");
22
- require("core-js/modules/es.array.some.js");
23
- var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
24
- var _react = _interopRequireWildcard(require("react"));
25
- var _client = require("@apollo/client");
26
- var _adminUiUtils = require("@blaze-cms/admin-ui-utils");
27
- var _checkboxes = require("@blaze-react/checkboxes");
28
- function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
29
- function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
30
- var MENU_PERMISSIONS = ['update:any', 'update:own', 'create:any', 'create:own'];
31
- var SearchAdminSideBar = function SearchAdminSideBar(_ref) {
32
- var searchModalSideBarClassName = _ref.searchModalSideBarClassName,
33
- openSearchSideBar = _ref.openSearchSideBar,
34
- setOpenSearchSideBar = _ref.setOpenSearchSideBar,
35
- handleSetEntityValues = _ref.handleSetEntityValues,
36
- entityValues = _ref.entityValues,
37
- setEntityValues = _ref.setEntityValues;
38
- var _useState = (0, _react.useState)(false),
39
- _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
40
- loadMore = _useState2[0],
41
- setLoadMore = _useState2[1];
42
- var _useQuery = (0, _client.useQuery)((0, _adminUiUtils.getQuery)('GET_USER_EDITABLE_ENTITIES'), {
43
- variables: {
44
- canDoActions: MENU_PERMISSIONS
45
- }
46
- }),
47
- _useQuery$data = _useQuery.data,
48
- _useQuery$data2 = _useQuery$data === void 0 ? {} : _useQuery$data,
49
- _useQuery$data2$getEn = _useQuery$data2.getEntitySchemas,
50
- getEntitySchemas = _useQuery$data2$getEn === void 0 ? [] : _useQuery$data2$getEn,
51
- loading = _useQuery.loading;
52
- if (loading) return null;
53
- var filteredEntitiesSchemas = getEntitySchemas.filter(function (entity) {
54
- if (Object.keys(entity.extras).length) {
55
- return entity.extras.searchIndexes.includes('admin');
56
- }
57
- return false;
58
- });
59
- var entitiesToShow = filteredEntitiesSchemas.slice(0, loadMore ? filteredEntitiesSchemas.length : 5);
60
- return /*#__PURE__*/_react["default"].createElement("div", {
61
- className: searchModalSideBarClassName
62
- }, /*#__PURE__*/_react["default"].createElement("div", {
63
- className: "modal__search__sidebar__button",
64
- role: "button",
65
- onClick: function onClick() {
66
- return setOpenSearchSideBar(!openSearchSideBar);
67
- }
68
- }, /*#__PURE__*/_react["default"].createElement("i", {
69
- className: "material-icons"
70
- }, openSearchSideBar ? 'keyboard_arrow_left' : 'keyboard_arrow_right')), /*#__PURE__*/_react["default"].createElement("div", {
71
- className: "modal__search__sidebar__container"
72
- }, /*#__PURE__*/_react["default"].createElement("div", {
73
- className: "modal__search__sidebar__wrapper"
74
- }, /*#__PURE__*/_react["default"].createElement("div", {
75
- className: "modal__search__sidebar__filters"
76
- }, /*#__PURE__*/_react["default"].createElement("i", {
77
- className: "material-icons modal__search__sidebar__icon"
78
- }, "tune"), /*#__PURE__*/_react["default"].createElement("span", null, "Filters")), /*#__PURE__*/_react["default"].createElement("div", {
79
- className: "modal__search__sidebar__clear",
80
- role: "button",
81
- onClick: function onClick() {
82
- return setEntityValues([]);
83
- }
84
- }, /*#__PURE__*/_react["default"].createElement("span", null, "Clear all"), /*#__PURE__*/_react["default"].createElement("i", {
85
- className: "material-icons modal__search__sidebar__icon--clear"
86
- }, "replay"))), /*#__PURE__*/_react["default"].createElement("div", {
87
- className: "modal__search__sidebar__entity-list"
88
- }, /*#__PURE__*/_react["default"].createElement("h1", null, "Entity list"), entitiesToShow.map(function (entity) {
89
- return /*#__PURE__*/_react["default"].createElement(_checkboxes.Checkbox, {
90
- checked: entityValues.some(function (_entity) {
91
- return _entity.id === entity.id;
92
- }),
93
- label: entity.displayName,
94
- id: entity.id,
95
- name: entity.id,
96
- onChange: function onChange(_ref2) {
97
- var checked = _ref2.value.checked;
98
- return handleSetEntityValues(entity);
99
- }
100
- });
101
- }), /*#__PURE__*/_react["default"].createElement("div", {
102
- className: "modal__search__sidebar__more",
103
- role: "button",
104
- onClick: function onClick() {
105
- return setLoadMore(!loadMore);
106
- }
107
- }, /*#__PURE__*/_react["default"].createElement("i", {
108
- className: "material-icons"
109
- }, !loadMore ? 'navigate_next' : 'expand_less'), /*#__PURE__*/_react["default"].createElement("span", null, loadMore ? 'Less' : 'More')))));
110
- };
111
- var _default = SearchAdminSideBar;
112
- exports["default"] = _default;
113
- //# sourceMappingURL=SearchAdminSideBar.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"SearchAdminSideBar.js","names":["MENU_PERMISSIONS","SearchAdminSideBar","searchModalSideBarClassName","openSearchSideBar","setOpenSearchSideBar","handleSetEntityValues","entityValues","setEntityValues","useState","loadMore","setLoadMore","useQuery","getQuery","variables","canDoActions","data","getEntitySchemas","loading","filteredEntitiesSchemas","filter","entity","Object","keys","extras","length","searchIndexes","includes","entitiesToShow","slice","map","some","_entity","id","displayName","checked","value"],"sources":["../../../../src/components/SearchAdmin/SearchAdminSideBar/SearchAdminSideBar.js"],"sourcesContent":["import React, { useState } from 'react';\nimport { useQuery } from '@apollo/client';\nimport { getQuery } from '@blaze-cms/admin-ui-utils';\nimport { Checkbox } from '@blaze-react/checkboxes';\n\nconst MENU_PERMISSIONS = ['update:any', 'update:own', 'create:any', 'create:own'];\n\nconst SearchAdminSideBar = ({\n searchModalSideBarClassName,\n openSearchSideBar,\n setOpenSearchSideBar,\n handleSetEntityValues,\n entityValues,\n setEntityValues\n}) => {\n const [loadMore, setLoadMore] = useState(false);\n const { data: { getEntitySchemas = [] } = {}, loading } = useQuery(\n getQuery('GET_USER_EDITABLE_ENTITIES'),\n {\n variables: {\n canDoActions: MENU_PERMISSIONS\n }\n }\n );\n\n if (loading) return null;\n\n const filteredEntitiesSchemas = getEntitySchemas.filter(entity => {\n if (Object.keys(entity.extras).length) {\n return entity.extras.searchIndexes.includes('admin');\n }\n return false;\n });\n\n const entitiesToShow = filteredEntitiesSchemas.slice(\n 0,\n loadMore ? filteredEntitiesSchemas.length : 5\n );\n\n return (\n <div className={searchModalSideBarClassName}>\n <div\n className=\"modal__search__sidebar__button\"\n role=\"button\"\n onClick={() => setOpenSearchSideBar(!openSearchSideBar)}>\n <i className=\"material-icons\">\n {openSearchSideBar ? 'keyboard_arrow_left' : 'keyboard_arrow_right'}\n </i>\n </div>\n <div className=\"modal__search__sidebar__container\">\n <div className=\"modal__search__sidebar__wrapper\">\n <div className=\"modal__search__sidebar__filters\">\n <i className=\"material-icons modal__search__sidebar__icon\">tune</i>\n <span>Filters</span>\n </div>\n <div\n className=\"modal__search__sidebar__clear\"\n role=\"button\"\n onClick={() => setEntityValues([])}>\n <span>Clear all</span>\n <i className=\"material-icons modal__search__sidebar__icon--clear\">replay</i>\n </div>\n </div>\n <div className=\"modal__search__sidebar__entity-list\">\n <h1>Entity list</h1>\n {entitiesToShow.map(entity => (\n <Checkbox\n checked={entityValues.some(_entity => _entity.id === entity.id)}\n label={entity.displayName}\n id={entity.id}\n name={entity.id}\n onChange={({ value: { checked } }) => handleSetEntityValues(entity)}\n />\n ))}\n <div\n className=\"modal__search__sidebar__more\"\n role=\"button\"\n onClick={() => setLoadMore(!loadMore)}>\n <i className=\"material-icons\">{!loadMore ? 'navigate_next' : 'expand_less'}</i>\n <span>{loadMore ? 'Less' : 'More'}</span>\n </div>\n </div>\n </div>\n </div>\n );\n};\n\nexport default SearchAdminSideBar;\n"],"mappings":"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"}
@@ -1,12 +0,0 @@
1
- "use strict";
2
-
3
- require("core-js/modules/es.object.define-property.js");
4
- var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
5
- Object.defineProperty(exports, "__esModule", {
6
- value: true
7
- });
8
- exports["default"] = void 0;
9
- var _SearchAdminSideBar = _interopRequireDefault(require("./SearchAdminSideBar"));
10
- var _default = _SearchAdminSideBar["default"];
11
- exports["default"] = _default;
12
- //# sourceMappingURL=index.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"index.js","names":["SearchAdminSideBar"],"sources":["../../../../src/components/SearchAdmin/SearchAdminSideBar/index.js"],"sourcesContent":["import SearchAdminSideBar from './SearchAdminSideBar';\n\nexport default SearchAdminSideBar;\n"],"mappings":";;;;;;;;AAAA;AAAsD,eAEvCA,8BAAkB;AAAA"}