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

package/lib-es/components/SearchAdmin/TriggerModal/TriggerModal.js.map

@@ -1 +1 @@
-{"version":3,"file":"TriggerModal.js","names":["React","PropTypes","TriggerModal","toggleSearchModal","propTypes","func","isRequired"],"sources":["../../../../src/components/SearchAdmin/TriggerModal/TriggerModal.js"],"sourcesContent":["import React from 'react';\nimport PropTypes from 'prop-types';\n\nconst TriggerModal = ({ toggleSearchModal }) => (\n  <span\n    role=\"button\"\n    className=\"material-icons searchModal-search-icon\"\n    onClick={toggleSearchModal}>\n    search\n  </span>\n);\n\nTriggerModal.propTypes = {\n  toggleSearchModal: PropTypes.func.isRequired\n};\n\nexport default TriggerModal;\n"],"mappings":"AAAA,OAAOA,KAAK,MAAM,OAAO;AACzB,OAAOC,SAAS,MAAM,YAAY;AAElC,MAAMC,YAAY,GAAG,CAAC;EAAEC;AAAkB,CAAC,kBACzC;EACE,IAAI,EAAC,QAAQ;EACb,SAAS,EAAC,wCAAwC;EAClD,OAAO,EAAEA;AAAkB,YAG9B;AAEDD,YAAY,CAACE,SAAS,GAAG;EACvBD,iBAAiB,EAAEF,SAAS,CAACI,IAAI,CAACC;AACpC,CAAC;AAED,eAAeJ,YAAY"}
+{"version":3,"file":"TriggerModal.js","names":["React","PropTypes","TriggerModal","toggleSearchModal","propTypes","func","isRequired"],"sources":["../../../../src/components/SearchAdmin/TriggerModal/TriggerModal.js"],"sourcesContent":["import React from 'react';\nimport PropTypes from 'prop-types';\n\nconst TriggerModal = ({ toggleSearchModal }) => (\n  <span\n    role=\"button\"\n    className=\"material-icons searchModal-search-icon\"\n    onClick={toggleSearchModal}>\n    search\n  </span>\n);\n\nTriggerModal.propTypes = {\n  toggleSearchModal: PropTypes.func.isRequired\n};\n\nexport default TriggerModal;\n"],"mappings":"AAAA,OAAOA,KAAK,MAAM,OAAO;AACzB,OAAOC,SAAS,MAAM,YAAY;AAElC,MAAMC,YAAY,GAAG,CAAC;EAAEC;AAAkB,CAAC,kBACzC;EACE,IAAI,EAAC,QAAQ;EACb,SAAS,EAAC,wCAAwC;EAClD,OAAO,EAAEA;AAAkB,GAAC,QAE9B,CACD;AAEDD,YAAY,CAACE,SAAS,GAAG;EACvBD,iBAAiB,EAAEF,SAAS,CAACI,IAAI,CAACC;AACpC,CAAC;AAED,eAAeJ,YAAY"}

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

@@ -16,6 +16,7 @@ function useSearch({
     value: ''
   });
   const [searchedValue, setSearchedValue] = useState(null);
+  const [en, setEn] = useState([]);
   const [previousOffset, setPreviousOffset] = useState(null);
   const buildSearchQuery = searchQueries[queryKey];
   const [getSearchResults, {
@@ -51,12 +52,13 @@ 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,
@@ -83,8 +85,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","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":";;;AAAA,SAASA,QAAQ,EAAEC,SAAS,QAAQ,OAAO;AAC3C,SAASC,YAAY,QAAQ,gBAAgB;AAC7C,OAAOC,aAAa,MAAM,yBAAyB;AAEnD,SAASC,SAAS,CAAC;EAAEC,QAAQ;EAAEC,UAAU;EAAEC,QAAQ,GAAG,EAAE;EAAEC;AAAO,CAAC,EAAE;EAClE,MAAM,CAACC,WAAW,EAAEC,SAAS,CAAC,GAAGV,QAAQ,CAAC;IAAEW,KAAK,EAAE,EAAE;IAAEC,MAAM,EAAE,CAAC;IAAEC,KAAK,EAAE;EAAG,CAAC,CAAC;EAC9E,MAAM,CAACC,aAAa,EAAEC,gBAAgB,CAAC,GAAGf,QAAQ,CAAC,IAAI,CAAC;EACxD,MAAM,CAACgB,cAAc,EAAEC,iBAAiB,CAAC,GAAGjB,QAAQ,CAAC,IAAI,CAAC;EAC1D,MAAMkB,gBAAgB,GAAGf,aAAa,CAACE,QAAQ,CAAC;EAChD,MAAM,CACJc,gBAAgB,EAChB;IACEC,OAAO;IACPC,IAAI,EAAE;MAAEC,MAAM,EAAE;QAAEC,OAAO;QAAEC,WAAW;QAAEC;MAAM;IAAE,CAAC,GAAG;MAClDH,MAAM,EAAE;QAAEC,OAAO,EAAE,EAAE;QAAEE,KAAK,EAAE;MAAE;IAClC;EACF,CAAC,CACF,GAAGvB,YAAY,CAACgB,gBAAgB,CAAC;IAAEZ;EAAW,CAAC,CAAC,EAAE;IAAEoB,GAAG,EAAE;EAAM,CAAC,CAAC;EAClE;EACA;;EAEA,MAAMC,iBAAiB,GAAGC,cAAc,IAAI;IAC1ClB,SAAS,iCAAMD,WAAW,GAAKmB,cAAc,EAAG;EAClD,CAAC;EAED3B,SAAS,CACP,MAAM;IACJ,MAAM;MAAEU,KAAK;MAAEC,MAAM;MAAEC;IAAM,CAAC,GAAGJ,WAAW;IAC5C,MAAMoB,aAAa,GAAGhB,KAAK,IAAIA,KAAK,KAAKC,aAAa;IACtD,MAAMgB,cAAc,GAAGd,cAAc,KAAK,IAAI,IAAIJ,MAAM,KAAKI,cAAc;IAC3E,MAAMe,cAAc,GAAGxB,QAAQ,CAACyB,MAAM,GAClCzB,QAAQ,CAAC0B,GAAG,CAACC,MAAM,KAAK;MACtBC,KAAK,EAAE;QAAEC,OAAO,EAAEF;MAAO;IAC3B,CAAC,CAAC,CAAC,GACH,EAAE;IAEN,IAAIL,aAAa,IAAIC,cAAc,EAAE;MACnCX,gBAAgB,CAAC;QACfkB,SAAS,EAAE;UACT1B,KAAK;UACLC,MAAM;UACN0B,QAAQ,EAAE;YACRC,KAAK,EAAE;cACLC,IAAI,EAAE;gBACJC,IAAI,EAAE,CACJ;kBACEC,YAAY,EAAE;oBACZH,KAAK,EAAE1B,KAAK;oBACZL,MAAM;oBACNmC,IAAI,EAAE,aAAa;oBACnBC,gBAAgB,EAAE;kBACpB;gBACF,CAAC,EACD;kBACEJ,IAAI,EAAE;oBACJK,MAAM,EAAEd;kBACV;gBACF,CAAC;cAEL;YACF;UACF;QACF;MACF,CAAC,CAAC;MACFhB,gBAAgB,CAACF,KAAK,CAAC;MACvBI,iBAAiB,CAACL,MAAM,CAAC;IAC3B;EACF,CAAC,EACD,CACEH,WAAW,EACXA,WAAW,CAACE,KAAK,EACjBF,WAAW,CAACI,KAAK,EACjBJ,WAAW,CAACG,MAAM,EAClBE,aAAa,EACbE,cAAc,EACdG,gBAAgB,EAChBZ,QAAQ,EACRC,MAAM,CACP,CACF;EAED,OAAO,CACL;IAAEM,aAAa,EAAEL,WAAW,CAACI,KAAK;IAAEO,OAAO;IAAEC,IAAI,EAAE;MAAEE,OAAO,EAAEA,OAAO,IAAIC,WAAW;MAAEC;IAAM;EAAE,CAAC,EAC/FE,iBAAiB,CAClB;AACH;AAEA,eAAevB,SAAS"}
+{"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

@@ -1,7 +1,6 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 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; }
 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({
   queryKey,
@@ -22,16 +21,7 @@ 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
     }));
@@ -41,7 +31,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,QAAQ,EAAEC,SAAS,QAAQ,OAAO;AAC3C,OAAOC,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;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,iCAAMO,MAAM;MAAEC,MAAM,EAAE;IAAC,GAAG;EACrC,CAAC;EAED,MAAMC,cAAc,GAAGF,MAAM,IAAI;IAC/BA,MAAM,CAACG,KAAK,KAAKf,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,EAAEU,cAAc,CAAC;AAClE;AAEA,eAAenB,gBAAgB"}
+{"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blaze-cms/plugin-search-ui",
-  "version": "0.127.0",
+  "version": "0.128.0-admin-updates.0",
   "description": "Blaze plugin search ui",
   "main": "lib/index.js",
   "module": "lib-es/index.js",
@@ -27,9 +27,9 @@
   },
   "license": "GPL-3.0",
   "dependencies": {
-    "@blaze-cms/admin-ui-utils": "^0.127.0",
-    "@blaze-cms/core-errors": "^0.127.0",
-    "@blaze-cms/setup-ui": "^0.127.0",
+    "@blaze-cms/admin-ui-utils": "0.128.0-admin-updates.0",
+    "@blaze-cms/core-errors": "0.128.0-admin-updates.0",
+    "@blaze-cms/setup-ui": "0.128.0-admin-updates.0",
     "@blaze-react/button": "0.5.19",
     "@blaze-react/input": "0.5.30",
     "@blaze-react/utils": "0.5.15",
@@ -40,7 +40,7 @@
     "react-tiny-virtual-list": "2.2.0"
   },
   "devDependencies": {
-    "@blaze-cms/core-ui": "^0.127.0"
+    "@blaze-cms/core-ui": "0.128.0-admin-updates.0"
   },
   "peerDependencies": {
     "@apollo/client": "3.x",
@@ -52,5 +52,5 @@
     "lib/*",
     "lib-es/*"
   ],
-  "gitHead": "dde05d6ccc6823315e5f16c8e7ded5a84637d9c4"
+  "gitHead": "ad3389e954fe463366655311efb1198191dbb625"
 }

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/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,
@@ -64,6 +67,7 @@ function useSearch({ queryKey, resultKeys, entities = [], fields }) {
         });
         setSearchedValue(value);
         setPreviousOffset(offset);
+        setEn(entities);
       }
     },
     [
@@ -75,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;