@blaze-cms/plugin-search-ui 0.124.0-alpha.21 → 0.125.0-admin-updates.0

package/lib-es/components/SearchPublishedContent/SearchPublishedContent.js.map

@@ -1 +1 @@
-{"version":3,"file":"SearchPublishedContent.js","names":["React","useState","useEffect","classnames","PropTypes","MdClose","MdSearch","useDebounce","useSearchResults","SEARCH_PUBLISHED","DEFAULT_RESULTS_KEYS","SEARCH_BUTTON","SearchPublishedContent","entities","children","resultKeys","getIsOpenSearchBar","SearchIcon","CloseIcon","className","onChange","placeholder","onEnterPress","inputRef","isSearchBarOpen","fields","displaySearchBar","setDisplaySearchBar","searchTerm","setSearchTerm","previousSearchTerm","setPreviousSearchTerm","debouncedSearchTerm","loading","results","setQueryParams","queryKey","current","focus","value","handleOnChange","target","handleKeyPress","event","onEnter","key","handleSearchBar","voidSearchTerm","searchWrapperClassname","triggerClassname","open","length","propTypes","array","func","isRequired","string","object","bool","defaultProps","state"],"sources":["../../../src/components/SearchPublishedContent/SearchPublishedContent.js"],"sourcesContent":["import React, { useState, useEffect } from 'react';\nimport classnames from 'classnames';\nimport PropTypes from 'prop-types';\nimport { MdClose, MdSearch } from 'react-icons/md';\nimport { useDebounce } from '@blaze-react/utils/lib/customHooks';\nimport useSearchResults from '../useSearchResults';\nimport { SEARCH_PUBLISHED, DEFAULT_RESULTS_KEYS, SEARCH_BUTTON } from '../../constants';\n\nconst SearchPublishedContent = ({\n  entities,\n  children,\n  resultKeys,\n  getIsOpenSearchBar,\n  SearchIcon,\n  CloseIcon,\n  className,\n  onChange,\n  placeholder,\n  onEnterPress,\n  inputRef,\n  isSearchBarOpen,\n  fields\n}) => {\n  const [displaySearchBar, setDisplaySearchBar] = useState(isSearchBarOpen);\n  const [searchTerm, setSearchTerm] = useState('');\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 (isSearchBarOpen !== displaySearchBar) {\n        setDisplaySearchBar(isSearchBarOpen);\n      }\n    },\n    // eslint-disable-next-line react-hooks/exhaustive-deps\n    [isSearchBarOpen]\n  );\n\n  useEffect(\n    () => {\n      if (inputRef && inputRef.current && displaySearchBar) {\n        inputRef.current.focus();\n      }\n    },\n    // eslint-disable-next-line react-hooks/exhaustive-deps\n    [displaySearchBar]\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  const handleOnChange = ({ target: { value = '' } = {} }) => {\n    onChange(value);\n    setSearchTerm(value);\n  };\n\n  const handleKeyPress = event => {\n    const onEnter = event.key === 'Enter';\n    onEnter && onEnterPress();\n  };\n\n  const handleSearchBar = () => {\n    const voidSearchTerm = '';\n    displaySearchBar && setSearchTerm(voidSearchTerm);\n    handleOnChange({ value: voidSearchTerm });\n    if (isSearchBarOpen !== null) {\n      getIsOpenSearchBar(!displaySearchBar);\n    }\n    setDisplaySearchBar(!displaySearchBar);\n  };\n\n  const searchWrapperClassname = classnames('search__wrapper', {\n    'search__wrapper--toggle-display': displaySearchBar,\n    'search__wrapper--toggle': !displaySearchBar\n  });\n\n  const triggerClassname = classnames('search__icon', {\n    open: displaySearchBar\n  });\n\n  return (\n    <div className={`search-wrapper ${className}`}>\n      <div className=\"search search--header search--toggle\">\n        <div className={searchWrapperClassname}>\n          <input\n            data-testid=\"search-input\"\n            onKeyPress={handleKeyPress}\n            placeholder={placeholder}\n            type=\"text\"\n            onChange={handleOnChange}\n            value={searchTerm}\n            ref={inputRef}\n          />\n          <button type=\"button\" className=\"icon-button icon-button--search icon-button--toggle\">\n            <SearchIcon />\n          </button>\n        </div>\n        <div\n          role=\"button\"\n          className={triggerClassname}\n          onClick={handleSearchBar}\n          id={SEARCH_BUTTON}\n          title={SEARCH_BUTTON}>\n          {!displaySearchBar ? <SearchIcon /> : <CloseIcon />}\n        </div>\n      </div>\n      <div className=\"search-modal\">\n        {children({ results: results.length && searchTerm ? results : [], loading })}\n      </div>\n    </div>\n  );\n};\n\nSearchPublishedContent.propTypes = {\n  entities: PropTypes.array,\n  children: PropTypes.func.isRequired,\n  resultKeys: PropTypes.string,\n  getIsOpenSearchBar: PropTypes.func,\n  SearchIcon: PropTypes.func,\n  CloseIcon: PropTypes.func,\n  onChange: PropTypes.func,\n  onEnterPress: PropTypes.func,\n  className: PropTypes.string,\n  placeholder: PropTypes.string,\n  inputRef: PropTypes.object,\n  isSearchBarOpen: PropTypes.bool,\n  fields: PropTypes.array\n};\n\nSearchPublishedContent.defaultProps = {\n  entities: ['published_page'],\n  placeholder: '',\n  resultKeys: DEFAULT_RESULTS_KEYS,\n  onChange: () => {},\n  onEnterPress: () => {},\n  getIsOpenSearchBar: state => state,\n  SearchIcon: () => (\n    <i>\n      <MdSearch />\n    </i>\n  ),\n  CloseIcon: () => (\n    <i>\n      <MdClose />\n    </i>\n  ),\n  className: '',\n  inputRef: null,\n  isSearchBarOpen: null,\n  fields: []\n};\n\nexport default SearchPublishedContent;\n"],"mappings":"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"}
+{"version":3,"file":"SearchPublishedContent.js","names":["React","useState","useEffect","classnames","PropTypes","MdClose","MdSearch","useDebounce","useSearchResults","SEARCH_PUBLISHED","DEFAULT_RESULTS_KEYS","SEARCH_BUTTON","SearchPublishedContent","entities","children","resultKeys","getIsOpenSearchBar","SearchIcon","CloseIcon","className","onChange","placeholder","onEnterPress","inputRef","isSearchBarOpen","fields","displaySearchBar","setDisplaySearchBar","searchTerm","setSearchTerm","previousSearchTerm","setPreviousSearchTerm","debouncedSearchTerm","loading","results","setQueryParams","queryKey","current","focus","value","handleOnChange","target","handleKeyPress","event","onEnter","key","handleSearchBar","voidSearchTerm","searchWrapperClassname","triggerClassname","open","length","propTypes","array","func","isRequired","string","object","bool","defaultProps","state"],"sources":["../../../src/components/SearchPublishedContent/SearchPublishedContent.js"],"sourcesContent":["import React, { useState, useEffect } from 'react';\nimport classnames from 'classnames';\nimport PropTypes from 'prop-types';\nimport { MdClose, MdSearch } from 'react-icons/md';\nimport { useDebounce } from '@blaze-react/utils/lib/customHooks';\nimport useSearchResults from '../useSearchResults';\nimport { SEARCH_PUBLISHED, DEFAULT_RESULTS_KEYS, SEARCH_BUTTON } from '../../constants';\n\nconst SearchPublishedContent = ({\n  entities,\n  children,\n  resultKeys,\n  getIsOpenSearchBar,\n  SearchIcon,\n  CloseIcon,\n  className,\n  onChange,\n  placeholder,\n  onEnterPress,\n  inputRef,\n  isSearchBarOpen,\n  fields\n}) => {\n  const [displaySearchBar, setDisplaySearchBar] = useState(isSearchBarOpen);\n  const [searchTerm, setSearchTerm] = useState('');\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 (isSearchBarOpen !== displaySearchBar) {\n        setDisplaySearchBar(isSearchBarOpen);\n      }\n    },\n    // eslint-disable-next-line react-hooks/exhaustive-deps\n    [isSearchBarOpen]\n  );\n\n  useEffect(\n    () => {\n      if (inputRef && inputRef.current && displaySearchBar) {\n        inputRef.current.focus();\n      }\n    },\n    // eslint-disable-next-line react-hooks/exhaustive-deps\n    [displaySearchBar]\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  const handleOnChange = ({ target: { value = '' } = {} }) => {\n    onChange(value);\n    setSearchTerm(value);\n  };\n\n  const handleKeyPress = event => {\n    const onEnter = event.key === 'Enter';\n    onEnter && onEnterPress();\n  };\n\n  const handleSearchBar = () => {\n    const voidSearchTerm = '';\n    displaySearchBar && setSearchTerm(voidSearchTerm);\n    handleOnChange({ value: voidSearchTerm });\n    if (isSearchBarOpen !== null) {\n      getIsOpenSearchBar(!displaySearchBar);\n    }\n    setDisplaySearchBar(!displaySearchBar);\n  };\n\n  const searchWrapperClassname = classnames('search__wrapper', {\n    'search__wrapper--toggle-display': displaySearchBar,\n    'search__wrapper--toggle': !displaySearchBar\n  });\n\n  const triggerClassname = classnames('search__icon', {\n    open: displaySearchBar\n  });\n\n  return (\n    <div className={`search-wrapper ${className}`}>\n      <div className=\"search search--header search--toggle\">\n        <div className={searchWrapperClassname}>\n          <input\n            data-testid=\"search-input\"\n            onKeyPress={handleKeyPress}\n            placeholder={placeholder}\n            type=\"text\"\n            onChange={handleOnChange}\n            value={searchTerm}\n            ref={inputRef}\n          />\n          <button type=\"button\" className=\"icon-button icon-button--search icon-button--toggle\">\n            <SearchIcon />\n          </button>\n        </div>\n        <div\n          role=\"button\"\n          className={triggerClassname}\n          onClick={handleSearchBar}\n          id={SEARCH_BUTTON}\n          title={SEARCH_BUTTON}>\n          {!displaySearchBar ? <SearchIcon /> : <CloseIcon />}\n        </div>\n      </div>\n      <div className=\"search-modal\">\n        {children({ results: results.length && searchTerm ? results : [], loading })}\n      </div>\n    </div>\n  );\n};\n\nSearchPublishedContent.propTypes = {\n  entities: PropTypes.array,\n  children: PropTypes.func.isRequired,\n  resultKeys: PropTypes.string,\n  getIsOpenSearchBar: PropTypes.func,\n  SearchIcon: PropTypes.func,\n  CloseIcon: PropTypes.func,\n  onChange: PropTypes.func,\n  onEnterPress: PropTypes.func,\n  className: PropTypes.string,\n  placeholder: PropTypes.string,\n  inputRef: PropTypes.object,\n  isSearchBarOpen: PropTypes.bool,\n  fields: PropTypes.array\n};\n\nSearchPublishedContent.defaultProps = {\n  entities: ['published_page'],\n  placeholder: '',\n  resultKeys: DEFAULT_RESULTS_KEYS,\n  onChange: () => {},\n  onEnterPress: () => {},\n  getIsOpenSearchBar: state => state,\n  SearchIcon: () => (\n    <i>\n      <MdSearch />\n    </i>\n  ),\n  CloseIcon: () => (\n    <i>\n      <MdClose />\n    </i>\n  ),\n  className: '',\n  inputRef: null,\n  isSearchBarOpen: null,\n  fields: []\n};\n\nexport default SearchPublishedContent;\n"],"mappings":"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"}

package/lib-es/components/useSearch/useSearch.js

@@ -20,6 +20,7 @@ function useSearch({
     value: ''
   });
   const [searchedValue, setSearchedValue] = useState(null);
+  const [en, setEn] = useState([]);
   const [previousOffset, setPreviousOffset] = useState(null);
   const buildSearchQuery = searchQueries[queryKey];
   const [getSearchResults, {
@@ -55,13 +56,14 @@ function useSearch({
     } = queryParams;
     const isNewValueSet = value && value !== searchedValue;
     const isNewOffsetSet = previousOffset !== null && offset !== previousOffset;
+    const notSameLength = en.length !== entities.length;
     const parsedEntities = entities.length ? entities.map(entity => ({
       match: {
         docType: entity
       }
     })) : [];
 
-    if (isNewValueSet || isNewOffsetSet) {
+    if (isNewValueSet || isNewOffsetSet || notSameLength) {
       getSearchResults({
         variables: {
           limit,
@@ -73,7 +75,8 @@ function useSearch({
                   query_string: {
                     query: value,
                     fields,
-                    type: 'most_fields'
+                    type: 'most_fields',
+                    default_operator: 'AND'
                   }
                 }, {
                   bool: {
@@ -87,8 +90,9 @@ function useSearch({
       });
       setSearchedValue(value);
       setPreviousOffset(offset);
+      setEn(entities);
     }
-  }, [queryParams, queryParams.limit, queryParams.value, queryParams.offset, searchedValue, previousOffset, getSearchResults, entities, fields]);
+  }, [queryParams, queryParams.limit, queryParams.value, queryParams.offset, searchedValue, previousOffset, getSearchResults, entities, fields, entities.length, en.length]);
   return [{
     searchedValue: queryParams.value,
     loading,

package/lib-es/components/useSearch/useSearch.js.map

@@ -1 +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","isNewValueSet","isNewOffsetSet","parsedEntities","length","map","entity","match","docType","variables","rawQuery","query","bool","must","query_string","type","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                      }\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":";;;;;;AAAA,SAASA,QAAT,EAAmBC,SAAnB,QAAoC,OAApC;AACA,SAASC,YAAT,QAA6B,gBAA7B;AACA,OAAOC,aAAP,MAA0B,yBAA1B;;AAEA,SAASC,SAAT,CAAmB;EAAEC,QAAF;EAAYC,UAAZ;EAAwBC,QAAQ,GAAG,EAAnC;EAAuCC;AAAvC,CAAnB,EAAoE;EAClE,MAAM,CAACC,WAAD,EAAcC,SAAd,IAA2BV,QAAQ,CAAC;IAAEW,KAAK,EAAE,EAAT;IAAaC,MAAM,EAAE,CAArB;IAAwBC,KAAK,EAAE;EAA/B,CAAD,CAAzC;EACA,MAAM,CAACC,aAAD,EAAgBC,gBAAhB,IAAoCf,QAAQ,CAAC,IAAD,CAAlD;EACA,MAAM,CAACgB,cAAD,EAAiBC,iBAAjB,IAAsCjB,QAAQ,CAAC,IAAD,CAApD;EACA,MAAMkB,gBAAgB,GAAGf,aAAa,CAACE,QAAD,CAAtC;EACA,MAAM,CACJc,gBADI,EAEJ;IACEC,OADF;IAEEC,IAAI,EAAE;MAAEC,MAAM,EAAE;QAAEC,OAAF;QAAWC,WAAX;QAAwBC;MAAxB;IAAV,IAA8C;MAClDH,MAAM,EAAE;QAAEC,OAAO,EAAE,EAAX;QAAeE,KAAK,EAAE;MAAtB;IAD0C;EAFtD,CAFI,IAQFvB,YAAY,CAACgB,gBAAgB,CAAC;IAAEZ;EAAF,CAAD,CAAjB,EAAmC;IAAEoB,GAAG,EAAE;EAAP,CAAnC,CARhB,CALkE,CAclE;EACA;;EAEA,MAAMC,iBAAiB,GAAGC,cAAc,IAAI;IAC1ClB,SAAS,iCAAMD,WAAN,GAAsBmB,cAAtB,EAAT;EACD,CAFD;;EAIA3B,SAAS,CACP,MAAM;IACJ,MAAM;MAAEU,KAAF;MAASC,MAAT;MAAiBC;IAAjB,IAA2BJ,WAAjC;IACA,MAAMoB,aAAa,GAAGhB,KAAK,IAAIA,KAAK,KAAKC,aAAzC;IACA,MAAMgB,cAAc,GAAGd,cAAc,KAAK,IAAnB,IAA2BJ,MAAM,KAAKI,cAA7D;IACA,MAAMe,cAAc,GAAGxB,QAAQ,CAACyB,MAAT,GACnBzB,QAAQ,CAAC0B,GAAT,CAAaC,MAAM,KAAK;MACtBC,KAAK,EAAE;QAAEC,OAAO,EAAEF;MAAX;IADe,CAAL,CAAnB,CADmB,GAInB,EAJJ;;IAMA,IAAIL,aAAa,IAAIC,cAArB,EAAqC;MACnCX,gBAAgB,CAAC;QACfkB,SAAS,EAAE;UACT1B,KADS;UAETC,MAFS;UAGT0B,QAAQ,EAAE;YACRC,KAAK,EAAE;cACLC,IAAI,EAAE;gBACJC,IAAI,EAAE,CACJ;kBACEC,YAAY,EAAE;oBACZH,KAAK,EAAE1B,KADK;oBAEZL,MAFY;oBAGZmC,IAAI,EAAE;kBAHM;gBADhB,CADI,EAQJ;kBACEH,IAAI,EAAE;oBACJI,MAAM,EAAEb;kBADJ;gBADR,CARI;cADF;YADD;UADC;QAHD;MADI,CAAD,CAAhB;MA0BAhB,gBAAgB,CAACF,KAAD,CAAhB;MACAI,iBAAiB,CAACL,MAAD,CAAjB;IACD;EACF,CAzCM,EA0CP,CACEH,WADF,EAEEA,WAAW,CAACE,KAFd,EAGEF,WAAW,CAACI,KAHd,EAIEJ,WAAW,CAACG,MAJd,EAKEE,aALF,EAMEE,cANF,EAOEG,gBAPF,EAQEZ,QARF,EASEC,MATF,CA1CO,CAAT;EAuDA,OAAO,CACL;IAAEM,aAAa,EAAEL,WAAW,CAACI,KAA7B;IAAoCO,OAApC;IAA6CC,IAAI,EAAE;MAAEE,OAAO,EAAEA,OAAO,IAAIC,WAAtB;MAAmCC;IAAnC;EAAnD,CADK,EAELE,iBAFK,CAAP;AAID;;AAED,eAAevB,SAAf"}
+{"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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"}

package/lib-es/components/useSearchResults/useSearchResults.js

@@ -4,7 +4,6 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 
 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; }
 
-import { useState, useEffect } from 'react';
 import useSearch from '../useSearch';
 
 function useSearchResults({
@@ -26,17 +25,8 @@ function useSearchResults({
     entities,
     fields
   });
-  const [currentResults, setCurrentResults] = useState([]);
-  const [allResults, setAllResults] = useState([]);
-  useEffect(() => {
-    if (currentResults.length !== results.length) {
-      setAllResults([...allResults, ...results]);
-      setCurrentResults(results);
-    }
-  }, [allResults, currentResults, currentResults.length, results]);
 
   const clearList = params => {
-    setAllResults([]);
     setParams(_objectSpread(_objectSpread({}, params), {}, {
       offset: 0
     }));
@@ -48,7 +38,7 @@ function useSearchResults({
 
   return [{
     loading,
-    results: allResults,
+    results,
     total
   }, setQueryParams];
 }

package/lib-es/components/useSearchResults/useSearchResults.js.map

@@ -1 +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","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,QAAT,EAAmBC,SAAnB,QAAoC,OAApC;AACA,OAAOC,SAAP,MAAsB,cAAtB;;AAEA,SAASC,gBAAT,CAA0B;EAAEC,QAAF;EAAYC,UAAZ;EAAwBC,QAAxB;EAAkCC;AAAlC,CAA1B,EAAsE;EACpE,MAAM,CACJ;IACEC,aADF;IAEEC,OAFF;IAGEC,IAAI,EAAE;MAAEC,OAAF;MAAWC;IAAX;EAHR,CADI,EAMJC,SANI,IAOFX,SAAS,CAAC;IAAEE,QAAF;IAAYC,UAAZ;IAAwBC,QAAxB;IAAkCC;EAAlC,CAAD,CAPb;EAQA,MAAM,CAACO,cAAD,EAAiBC,iBAAjB,IAAsCf,QAAQ,CAAC,EAAD,CAApD;EACA,MAAM,CAACgB,UAAD,EAAaC,aAAb,IAA8BjB,QAAQ,CAAC,EAAD,CAA5C;EAEAC,SAAS,CACP,MAAM;IACJ,IAAIa,cAAc,CAACI,MAAf,KAA0BP,OAAO,CAACO,MAAtC,EAA8C;MAC5CD,aAAa,CAAC,CAAC,GAAGD,UAAJ,EAAgB,GAAGL,OAAnB,CAAD,CAAb;MACAI,iBAAiB,CAACJ,OAAD,CAAjB;IACD;EACF,CANM,EAOP,CAACK,UAAD,EAAaF,cAAb,EAA6BA,cAAc,CAACI,MAA5C,EAAoDP,OAApD,CAPO,CAAT;;EAUA,MAAMQ,SAAS,GAAGC,MAAM,IAAI;IAC1BH,aAAa,CAAC,EAAD,CAAb;IACAJ,SAAS,iCAAMO,MAAN;MAAcC,MAAM,EAAE;IAAtB,GAAT;EACD,CAHD;;EAKA,MAAMC,cAAc,GAAGF,MAAM,IAAI;IAC/BA,MAAM,CAACG,KAAP,KAAiBf,aAAjB,GAAiCW,SAAS,CAACC,MAAD,CAA1C,GAAqDP,SAAS,CAACO,MAAD,CAA9D;EACD,CAFD;;EAIA,OAAO,CAAC;IAAEX,OAAF;IAAWE,OAAO,EAAEK,UAApB;IAAgCJ;EAAhC,CAAD,EAA0CU,cAA1C,CAAP;AACD;;AAED,eAAenB,gBAAf"}
+{"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,SAAP,MAAsB,cAAtB;;AAEA,SAASC,gBAAT,CAA0B;EAAEC,QAAF;EAAYC,UAAZ;EAAwBC,QAAxB;EAAkCC;AAAlC,CAA1B,EAAsE;EACpE,MAAM,CACJ;IACEC,aADF;IAEEC,OAFF;IAGEC,IAAI,EAAE;MAAEC,OAAF;MAAWC;IAAX;EAHR,CADI,EAMJC,SANI,IAOFX,SAAS,CAAC;IAAEE,QAAF;IAAYC,UAAZ;IAAwBC,QAAxB;IAAkCC;EAAlC,CAAD,CAPb;;EASA,MAAMO,SAAS,GAAGC,MAAM,IAAI;IAC1BF,SAAS,iCAAME,MAAN;MAAcC,MAAM,EAAE;IAAtB,GAAT;EACD,CAFD;;EAIA,MAAMC,cAAc,GAAGF,MAAM,IAAI;IAC/BA,MAAM,CAACG,KAAP,KAAiBV,aAAjB,GAAiCM,SAAS,CAACC,MAAD,CAA1C,GAAqDF,SAAS,CAACE,MAAD,CAA9D;EACD,CAFD;;EAIA,OAAO,CAAC;IAAEN,OAAF;IAAWE,OAAX;IAAoBC;EAApB,CAAD,EAA8BK,cAA9B,CAAP;AACD;;AAED,eAAed,gBAAf"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blaze-cms/plugin-search-ui",
-  "version": "0.124.0-alpha.21",
+  "version": "0.125.0-admin-updates.0",
   "description": "Blaze plugin search ui",
   "main": "lib/index.js",
   "module": "lib-es/index.js",
@@ -27,7 +27,7 @@
   },
   "license": "GPL-3.0",
   "dependencies": {
-    "@blaze-cms/admin-ui-utils": "^0.124.0-alpha.2",
+    "@blaze-cms/admin-ui-utils": "^0.125.0-admin-updates.0",
     "@blaze-cms/core-errors": "^0.118.0",
     "@blaze-cms/setup-ui": "^0.92.0",
     "@blaze-react/button": "0.5.19",
@@ -52,5 +52,5 @@
     "lib/*",
     "lib-es/*"
   ],
-  "gitHead": "6c17771cbc704bc1bc0943f71a0b8f8e3eb531fa"
+  "gitHead": "935ad60cd8cb3d04e45459a93a04bc0846644445"
 }

package/src/components/SearchAdmin/SearchAdmin.js

@@ -1,21 +1,28 @@
 import React, { useState, useRef, useEffect } from 'react';
 import classnames from 'classnames';
+import { useDebounce } from '@blaze-react/utils/lib/customHooks';
 import useLocalStorage from '../useLocalStorage';
 import SearchBar from './SearchBar';
 import RecentSearches from './RecentSearches';
 import SearchResults from './SearchResults';
 import TriggerModal from './TriggerModal';
+import SearchAdminSideBar from './SearchAdminSideBar';
 import useSearchResults from '../useSearchResults';
 import { SEARCH_ADMIN } from '../../constants';
 
 const SearchAdmin = () => {
   const [searchTerm, setSearchTerm] = useState('');
+  const [openSearchSideBar, setOpenSearchSideBar] = useState(true);
+  const [entityValues, setEntityValues] = useState([]);
+
   const [recentSearches, setRecentSearches] = useLocalStorage('recentSearches', []);
   const [displaySearchModalFrame, setDisplaySearchModalFrame] = useState(false);
   const [enableResults, setEnableResults] = useState(true);
   const searchInputRef = useRef(null);
+  const debouncedEntityValues = useDebounce(entityValues, 500);
   const [{ loading, results, total }, setQueryParams] = useSearchResults({
-    queryKey: SEARCH_ADMIN
+    queryKey: SEARCH_ADMIN,
+    entities: debouncedEntityValues.map(e => e.id)
   });
 
   useEffect(
@@ -68,6 +75,10 @@ const SearchAdmin = () => {
     'modal--show': displaySearchModalFrame
   });
 
+  const searchModalSideBarClassName = classnames('modal__search__sidebar', {
+    'modal__search__sidebar--close': !openSearchSideBar
+  });
+
   const isEmptySearchTermAndData = !searchTerm && !results.length;
   const isEmptySearchTermnAndDisabledResults = !searchTerm && !enableResults;
   const shouldDisplayRecentSearches =
@@ -75,51 +86,70 @@ const SearchAdmin = () => {
 
   const showResults = enableResults && results.length;
 
+  const handleSetEntityValues = newEntity => {
+    const entityExists = entityValues.some(entity => entity.id === newEntity.id);
+    if (entityExists) {
+      setEntityValues(entityValues.filter(entity => entity.id !== newEntity.id));
+    } else {
+      setEntityValues([...entityValues, newEntity]);
+    }
+  };
+
   return (
     <div className="search search--header">
       <TriggerModal toggleSearchModal={toggleSearchModal} />
       <div className={searchModalResultsClassName}>
         {displaySearchModalFrame && (
-          <>
-            <div className="modal__header modal__header--search">
-              <SearchBar
-                toggleSearchModal={toggleSearchModal}
-                handleKeyDown={handleKeyDown}
-                searchInputRef={searchInputRef}
-                handleSearchTerm={handleSearchTerm}
-                searchTerm={searchTerm}
-                search={() => search({ value: searchTerm })}
-              />
-            </div>
-            {shouldDisplayRecentSearches ? (
-              <RecentSearches
-                recentSearches={recentSearches}
-                handleSearchTerm={handleSearchTerm}
-                search={search}
-              />
-            ) : (
-              <>
-                {!showResults && (
-                  <div className="list list--search">
-                    <div className="header header--list">
-                      <h2>No Results</h2>
+          <div className="modal__search">
+            <SearchAdminSideBar
+              searchModalSideBarClassName={searchModalSideBarClassName}
+              openSearchSideBar={openSearchSideBar}
+              setOpenSearchSideBar={setOpenSearchSideBar}
+              handleSetEntityValues={handleSetEntityValues}
+              entityValues={entityValues}
+              setEntityValues={setEntityValues}
+            />
+            <div className="modal__search__content">
+              <div className="modal__header modal__header--search">
+                <SearchBar
+                  toggleSearchModal={toggleSearchModal}
+                  handleKeyDown={handleKeyDown}
+                  searchInputRef={searchInputRef}
+                  handleSearchTerm={handleSearchTerm}
+                  searchTerm={searchTerm}
+                  search={() => search({ value: searchTerm })}
+                />
+              </div>
+              {shouldDisplayRecentSearches ? (
+                <RecentSearches
+                  recentSearches={recentSearches}
+                  handleSearchTerm={handleSearchTerm}
+                  search={search}
+                />
+              ) : (
+                <>
+                  {!showResults && (
+                    <div className="list list--search">
+                      <div className="header header--list">
+                        <h2>No Results</h2>
+                      </div>
                     </div>
-                  </div>
-                )}
-              </>
-            )}
-            {showResults && (
-              <SearchResults
-                currentValue={searchTerm}
-                searchTerm={searchTerm}
-                loading={loading}
-                results={results}
-                total={total}
-                setQueryParams={setQueryParams}
-                closeModal={toggleSearchModal}
-              />
-            )}
-          </>
+                  )}
+                </>
+              )}
+              {showResults && (
+                <SearchResults
+                  currentValue={searchTerm}
+                  searchTerm={searchTerm}
+                  loading={loading}
+                  results={results}
+                  total={total}
+                  setQueryParams={setQueryParams}
+                  closeModal={toggleSearchModal}
+                />
+              )}
+            </div>
+          </div>
         )}
       </div>
     </div>

package/src/components/SearchAdmin/SearchAdminSideBar/SearchAdminSideBar.js

@@ -0,0 +1,88 @@
+import React, { useState } from 'react';
+import { useQuery } from '@apollo/client';
+import { getQuery } from '@blaze-cms/admin-ui-utils';
+import { Checkbox } from '@blaze-react/checkboxes';
+
+const MENU_PERMISSIONS = ['update:any', 'update:own', 'create:any', 'create:own'];
+
+const SearchAdminSideBar = ({
+  searchModalSideBarClassName,
+  openSearchSideBar,
+  setOpenSearchSideBar,
+  handleSetEntityValues,
+  entityValues,
+  setEntityValues
+}) => {
+  const [loadMore, setLoadMore] = useState(false);
+  const { data: { getEntitySchemas = [] } = {}, loading } = useQuery(
+    getQuery('GET_USER_EDITABLE_ENTITIES'),
+    {
+      variables: {
+        canDoActions: MENU_PERMISSIONS
+      }
+    }
+  );
+
+  if (loading) return null;
+
+  const filteredEntitiesSchemas = getEntitySchemas.filter(entity => {
+    if (Object.keys(entity.extras).length) {
+      return entity.extras.searchIndexes.includes('admin');
+    }
+    return false;
+  });
+
+  const entitiesToShow = filteredEntitiesSchemas.slice(
+    0,
+    loadMore ? filteredEntitiesSchemas.length : 5
+  );
+
+  return (
+    <div className={searchModalSideBarClassName}>
+      <div
+        className="modal__search__sidebar__button"
+        role="button"
+        onClick={() => setOpenSearchSideBar(!openSearchSideBar)}>
+        <i className="material-icons">
+          {openSearchSideBar ? 'keyboard_arrow_left' : 'keyboard_arrow_right'}
+        </i>
+      </div>
+      <div className="modal__search__sidebar__container">
+        <div className="modal__search__sidebar__wrapper">
+          <div className="modal__search__sidebar__filters">
+            <i className="material-icons modal__search__sidebar__icon">tune</i>
+            <span>Filters</span>
+          </div>
+          <div
+            className="modal__search__sidebar__clear"
+            role="button"
+            onClick={() => setEntityValues([])}>
+            <span>Clear all</span>
+            <i className="material-icons modal__search__sidebar__icon--clear">replay</i>
+          </div>
+        </div>
+        <div className="modal__search__sidebar__entity-list">
+          <h1>Entity list</h1>
+          {entitiesToShow.map(entity => (
+            <Checkbox
+              checked={entityValues.some(_entity => _entity.id === entity.id)}
+              label={entity.displayName}
+              id={entity.id}
+              name={entity.id}
+              onChange={({ value: { checked } }) => handleSetEntityValues(entity)}
+            />
+          ))}
+          <div
+            className="modal__search__sidebar__more"
+            role="button"
+            onClick={() => setLoadMore(!loadMore)}>
+            <i className="material-icons">{!loadMore ? 'navigate_next' : 'expand_less'}</i>
+            <span>{loadMore ? 'Less' : 'More'}</span>
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+};
+
+export default SearchAdminSideBar;

package/src/components/SearchAdmin/SearchAdminSideBar/index.js

@@ -0,0 +1,3 @@
+import SearchAdminSideBar from './SearchAdminSideBar';
+
+export default SearchAdminSideBar;

package/src/components/SearchAdmin/SearchResults/SearchResults.js

@@ -54,7 +54,9 @@ const SearchResults = ({
       {loading && <span>Loading...</span>}
       <div className="modal__content modal__content--search">
         <div className="header header--list">
-          <h2>{total} results</h2>
+          <h2 className="header--list--results">
+            About <b>{total}</b> search keywords results
+          </h2>
         </div>
         <VirtualList
           width="100%"
@@ -65,15 +67,24 @@ const SearchResults = ({
           scrollToIndex={currentIndex}
           onItemsRendered={handleRenderedItems}
           renderItem={({ index, style }) => {
-            const { id, docType, updated, name } = results[index];
+            const {
+              id,
+              docType,
+              updated,
+              name,
+              entityIdentifier,
+              published,
+              created,
+              status
+            } = results[index];
             const updatedDate = updated ? getDateFormat(updated) : null;
+            const createdDate = created ? getDateFormat(created) : null;
+            const publishedDate = published ? getDateFormat(published) : null;
             return (
               <div key={index} style={style} className="list__item--resultWrapper">
                 <div className="list__item list__item--result">
                   <div className="list__item-row list__item-row--result">
-                    <span className="badge badge--primary">
-                      {docType} {updatedDate}
-                    </span>
+                    <span className="list__item-identifier">{entityIdentifier}</span>
                     <a
                       href={getNavigationRoute({
                         id,
@@ -85,9 +96,34 @@ const SearchResults = ({
                           docType
                         })
                       }
-                      className="list__item-text list__item-text--result">
+                      className="list__item-link">
                       {name}
                     </a>
+
+                    <div className="list__item-dates">
+                      {publishedDate && (
+                        <span>
+                          <b>Published: </b>
+                          {publishedDate}
+                        </span>
+                      )}
+                      <span>
+                        <b>Created: </b>
+                        {createdDate}
+                      </span>
+                      <span>
+                        <b>Updated: </b>
+                        {updatedDate}
+                      </span>
+                    </div>
+                    <div className="list__item-status">
+                      {status && (
+                        <span>
+                          <b>Status: </b>
+                          {status}
+                        </span>
+                      )}
+                    </div>
                   </div>
                 </div>
               </div>

package/src/components/SearchPublishedContent/SearchPublishedContent.js

@@ -56,7 +56,7 @@ const SearchPublishedContent = ({
   useEffect(
     () => {
       if (debouncedSearchTerm && debouncedSearchTerm !== previousSearchTerm) {
-        setQueryParams({ value: debouncedSearchTerm });
+        setQueryParams({ value: `${debouncedSearchTerm}*` });
         setPreviousSearchTerm(debouncedSearchTerm);
       }
     },

package/src/components/useSearch/useSearch.js

@@ -5,7 +5,9 @@ import searchQueries from '../../application/query';
 function useSearch({ queryKey, resultKeys, entities = [], fields }) {
   const [queryParams, setParams] = useState({ limit: 20, offset: 0, value: '' });
   const [searchedValue, setSearchedValue] = useState(null);
+  const [en, setEn] = useState([]);
   const [previousOffset, setPreviousOffset] = useState(null);
+
   const buildSearchQuery = searchQueries[queryKey];
   const [
     getSearchResults,
@@ -28,13 +30,14 @@ function useSearch({ queryKey, resultKeys, entities = [], fields }) {
       const { limit, offset, value } = queryParams;
       const isNewValueSet = value && value !== searchedValue;
       const isNewOffsetSet = previousOffset !== null && offset !== previousOffset;
+      const notSameLength = en.length !== entities.length;
       const parsedEntities = entities.length
         ? entities.map(entity => ({
             match: { docType: entity }
           }))
         : [];
 
-      if (isNewValueSet || isNewOffsetSet) {
+      if (isNewValueSet || isNewOffsetSet || notSameLength) {
         getSearchResults({
           variables: {
             limit,
@@ -47,7 +50,8 @@ function useSearch({ queryKey, resultKeys, entities = [], fields }) {
                       query_string: {
                         query: value,
                         fields,
-                        type: 'most_fields'
+                        type: 'most_fields',
+                        default_operator: 'AND'
                       }
                     },
                     {
@@ -63,6 +67,7 @@ function useSearch({ queryKey, resultKeys, entities = [], fields }) {
         });
         setSearchedValue(value);
         setPreviousOffset(offset);
+        setEn(entities);
       }
     },
     [
@@ -74,7 +79,9 @@ function useSearch({ queryKey, resultKeys, entities = [], fields }) {
       previousOffset,
       getSearchResults,
       entities,
-      fields
+      fields,
+      entities.length,
+      en.length
     ]
   );
 

package/src/components/useSearchResults/useSearchResults.js

@@ -1,4 +1,3 @@
-import { useState, useEffect } from 'react';
 import useSearch from '../useSearch';
 
 function useSearchResults({ queryKey, resultKeys, entities, fields }) {
@@ -10,21 +9,8 @@ function useSearchResults({ queryKey, resultKeys, entities, fields }) {
     },
     setParams
   ] = useSearch({ queryKey, resultKeys, entities, fields });
-  const [currentResults, setCurrentResults] = useState([]);
-  const [allResults, setAllResults] = useState([]);
-
-  useEffect(
-    () => {
-      if (currentResults.length !== results.length) {
-        setAllResults([...allResults, ...results]);
-        setCurrentResults(results);
-      }
-    },
-    [allResults, currentResults, currentResults.length, results]
-  );
 
   const clearList = params => {
-    setAllResults([]);
     setParams({ ...params, offset: 0 });
   };
 
@@ -32,7 +18,7 @@ function useSearchResults({ queryKey, resultKeys, entities, fields }) {
     params.value !== searchedValue ? clearList(params) : setParams(params);
   };
 
-  return [{ loading, results: allResults, total }, setQueryParams];
+  return [{ loading, results, total }, setQueryParams];
 }
 
 export default useSearchResults;