@blaze-cms/plugin-search-ui 0.129.0 → 0.130.0-admin-updates.1

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","_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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"}
+{"version":3,"file":"useSearch.js","names":["useState","useEffect","useLazyQuery","searchQueries","useSearch","queryKey","resultKeys","entities","fields","queryParams","setParams","limit","offset","value","searchedValue","setSearchedValue","previousEntities","setPreviousEntities","previousOffset","setPreviousOffset","buildSearchQuery","getSearchResults","loading","data","search","results","jsonResults","total","ssr","handleQueryParams","newQueryParams","_objectSpread","isNewValueSet","isNewOffsetSet","notSameLength","length","parsedEntities","map","entity","match","docType","variables","rawQuery","query","bool","must","query_string","type","default_operator","should"],"sources":["../../../src/components/useSearch/useSearch.js"],"sourcesContent":["import { useState, useEffect } from 'react';\nimport { useLazyQuery } from '@apollo/client';\nimport searchQueries from '../../application/query';\n\nfunction useSearch({ queryKey, resultKeys, entities = [], fields }) {\n  const [queryParams, setParams] = useState({ limit: 20, offset: 0, value: '' });\n  const [searchedValue, setSearchedValue] = useState(null);\n  const [previousEntities, setPreviousEntities] = useState([]);\n  const [previousOffset, setPreviousOffset] = useState(null);\n  const buildSearchQuery = searchQueries[queryKey];\n\n  const [\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 = previousEntities.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        setPreviousEntities(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      previousEntities.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

@@ -9,6 +9,8 @@ function useSearchResults({
   entities,
   fields
 }) {
+  const [currentResults, setCurrentResults] = useState([]);
+  const [allResults, setAllResults] = useState([]);
   const [{
     searchedValue,
     loading,
@@ -22,14 +24,12 @@ 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]);
+  }, [allResults, currentResults, results]);
   const clearList = params => {
     setAllResults([]);
     setParams(_objectSpread(_objectSpread({}, params), {}, {

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","_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,CAC7D,CAAC;EAED,MAAMQ,SAAS,GAAGC,MAAM,IAAI;IAC1BH,aAAa,CAAC,EAAE,CAAC;IACjBJ,SAAS,CAAAQ,aAAA,CAAAA,aAAA,KAAMD,MAAM;MAAEE,MAAM,EAAE;IAAC,EAAE,CAAC;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"}
+{"version":3,"file":"useSearchResults.js","names":["useState","useEffect","useSearch","useSearchResults","queryKey","resultKeys","entities","fields","currentResults","setCurrentResults","allResults","setAllResults","searchedValue","loading","data","results","total","setParams","length","clearList","params","_objectSpread","offset","setQueryParams","value"],"sources":["../../../src/components/useSearchResults/useSearchResults.js"],"sourcesContent":["import { useState, useEffect } from 'react';\nimport useSearch from '../useSearch';\n\nfunction useSearchResults({ queryKey, resultKeys, entities, fields }) {\n  const [currentResults, setCurrentResults] = useState([]);\n  const [allResults, setAllResults] = useState([]);\n  const [\n    {\n      searchedValue,\n      loading,\n      data: { results, total }\n    },\n    setParams\n  ] = useSearch({ queryKey, resultKeys, entities, fields });\n\n  useEffect(\n    () => {\n      if (currentResults.length !== results.length) {\n        setAllResults([...allResults, ...results]);\n        setCurrentResults(results);\n      }\n    },\n    [allResults, currentResults, 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  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,CAACC,cAAc,EAAEC,iBAAiB,CAAC,GAAGT,QAAQ,CAAC,EAAE,CAAC;EACxD,MAAM,CAACU,UAAU,EAAEC,aAAa,CAAC,GAAGX,QAAQ,CAAC,EAAE,CAAC;EAChD,MAAM,CACJ;IACEY,aAAa;IACbC,OAAO;IACPC,IAAI,EAAE;MAAEC,OAAO;MAAEC;IAAM;EACzB,CAAC,EACDC,SAAS,CACV,GAAGf,SAAS,CAAC;IAAEE,QAAQ;IAAEC,UAAU;IAAEC,QAAQ;IAAEC;EAAO,CAAC,CAAC;EAEzDN,SAAS,CACP,MAAM;IACJ,IAAIO,cAAc,CAACU,MAAM,KAAKH,OAAO,CAACG,MAAM,EAAE;MAC5CP,aAAa,CAAC,CAAC,GAAGD,UAAU,EAAE,GAAGK,OAAO,CAAC,CAAC;MAC1CN,iBAAiB,CAACM,OAAO,CAAC;IAC5B;EACF,CAAC,EACD,CAACL,UAAU,EAAEF,cAAc,EAAEO,OAAO,CACtC,CAAC;EAED,MAAMI,SAAS,GAAGC,MAAM,IAAI;IAC1BT,aAAa,CAAC,EAAE,CAAC;IACjBM,SAAS,CAAAI,aAAA,CAAAA,aAAA,KAAMD,MAAM;MAAEE,MAAM,EAAE;IAAC,EAAE,CAAC;EACrC,CAAC;EAED,MAAMC,cAAc,GAAGH,MAAM,IAAI;IAC/BA,MAAM,CAACI,KAAK,KAAKZ,aAAa,GAAGO,SAAS,CAACC,MAAM,CAAC,GAAGH,SAAS,CAACG,MAAM,CAAC;EACxE,CAAC;EACD,OAAO,CAAC;IAAEP,OAAO;IAAEE,OAAO,EAAEL,UAAU;IAAEM;EAAM,CAAC,EAAEO,cAAc,CAAC;AAClE;AAEA,eAAepB,gBAAgB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blaze-cms/plugin-search-ui",
-  "version": "0.129.0",
+  "version": "0.130.0-admin-updates.1",
   "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.129.0",
-    "@blaze-cms/core-errors": "^0.127.0",
-    "@blaze-cms/setup-ui": "^0.128.1",
+    "@blaze-cms/admin-ui-utils": "0.130.0-admin-updates.1",
+    "@blaze-cms/core-errors": "0.130.0-admin-updates.0",
+    "@blaze-cms/setup-ui": "0.130.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.129.0"
+    "@blaze-cms/core-ui": "0.130.0-admin-updates.0"
   },
   "peerDependencies": {
     "@apollo/client": "3.x",
@@ -52,5 +52,5 @@
     "lib/*",
     "lib-es/*"
   ],
-  "gitHead": "43e8a5d929313c50f8edb27358da7278299ce6c6"
+  "gitHead": "4e0309c95a03721be15230df053a74b94bfbdb0b"
 }

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(
@@ -30,11 +37,13 @@ const SearchAdmin = () => {
   const handleSearchTerm = ({ target: { value } }) => {
     setSearchTerm(value);
   };
+
   const toggleSearchModal = () => {
     setSearchTerm(null);
     setEnableResults(false);
     setDisplaySearchModalFrame(!displaySearchModalFrame);
   };
+
   const search = ({ value }) => {
     if (!value) return;
     !enableResults && setEnableResults(true);
@@ -68,58 +77,69 @@ 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 =
     isEmptySearchTermAndData || isEmptySearchTermnAndDisabledResults;
 
-  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 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}
+                />
+              )}
+              {enableResults && (
+                <SearchResults
+                  currentValue={searchTerm}
+                  searchTerm={searchTerm}
+                  loading={loading}
+                  results={results}
+                  total={total}
+                  setQueryParams={setQueryParams}
+                  closeModal={toggleSearchModal}
+                />
+              )}
             </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>
-                )}
-              </>
-            )}
-            {showResults && (
-              <SearchResults
-                currentValue={searchTerm}
-                searchTerm={searchTerm}
-                loading={loading}
-                results={results}
-                total={total}
-                setQueryParams={setQueryParams}
-                closeModal={toggleSearchModal}
-              />
-            )}
-          </>
+          </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

@@ -1,6 +1,6 @@
 /* eslint-disable jsx-a11y/anchor-is-valid */
 /* eslint-disable jsx-a11y/no-static-element-interactions */
-import React, { useState } from 'react';
+import React, { useState, useEffect } from 'react';
 import PropTypes from 'prop-types';
 import VirtualList from 'react-tiny-virtual-list';
 import { withRouter } from 'react-router-dom';
@@ -22,6 +22,20 @@ const SearchResults = ({
 }) => {
   const [verifiedRanges, setVerifiedRanges] = useState([]);
   const [currentIndex, setCurrentIndex] = useState(0);
+  const [currentResults, setCurrentResults] = useState([]);
+  const [currentTotal, setCurrentTotal] = useState(0);
+
+  useEffect(
+    () => {
+      if (!loading) {
+        const [lowestRange] = verifiedRanges;
+        setCurrentTotal(total);
+        setCurrentResults(results);
+        if (lowestRange > results.length) setVerifiedRanges([]);
+      }
+    },
+    [loading, results, total, verifiedRanges]
+  );
 
   const handleRenderedItems = async ({ startIndex }) => {
     const rowsLength = results.length;
@@ -49,53 +63,96 @@ const SearchResults = ({
     return `${day}.${month}.${year}`;
   };
 
-  return (
-    <>
-      {loading && <span>Loading...</span>}
-      <div className="modal__content modal__content--search">
+  if (!currentResults.length)
+    return (
+      <div className="list list--search">
         <div className="header header--list">
-          <h2>{total} results</h2>
+          <h2>No Results</h2>
         </div>
-        <VirtualList
-          width="100%"
-          height={window.innerHeight - SEARCH_RESULTS_ELEMETS_HEIGHT_ABOVE_LIST}
-          itemCount={results.length}
-          itemSize={SEARCH_RESULTS_ITEM_SIZE}
-          overscanCount={SEARCH_RESULTS_OVER_SCAN_BUFFER}
-          scrollToIndex={currentIndex}
-          onItemsRendered={handleRenderedItems}
-          renderItem={({ index, style }) => {
-            const { id, docType, updated, name } = results[index];
-            const updatedDate = updated ? getDateFormat(updated) : 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>
-                    <a
-                      href={getNavigationRoute({
+      </div>
+    );
+
+  return (
+    <div className="modal__content modal__content--search">
+      <div className="header header--list">
+        <h2 className="header--list--results">
+          About <b>{currentTotal}</b> search keywords results
+        </h2>
+      </div>
+      <VirtualList
+        width="100%"
+        height={window.innerHeight - SEARCH_RESULTS_ELEMETS_HEIGHT_ABOVE_LIST}
+        itemCount={currentResults.length}
+        itemSize={SEARCH_RESULTS_ITEM_SIZE}
+        overscanCount={SEARCH_RESULTS_OVER_SCAN_BUFFER}
+        scrollToIndex={currentIndex}
+        onItemsRendered={handleRenderedItems}
+        renderItem={({ index, style }) => {
+          const {
+            id,
+            docType,
+            updated,
+            name,
+            entityIdentifier,
+            published,
+            created,
+            status
+          } = currentResults[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="list__item-identifier">{entityIdentifier}</span>
+                  <a
+                    href={getNavigationRoute({
+                      id,
+                      docType
+                    })}
+                    onClick={() =>
+                      navigate({
                         id,
                         docType
-                      })}
-                      onClick={() =>
-                        navigate({
-                          id,
-                          docType
-                        })
-                      }
-                      className="list__item-text list__item-text--result">
-                      {name}
-                    </a>
+                      })
+                    }
+                    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>
-    </>
+            </div>
+          );
+        }}
+      />
+      {loading && <span>Loading...</span>}
+    </div>
   );
 };
 

package/src/components/useSearch/useSearch.js

@@ -5,8 +5,10 @@ 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 [previousEntities, setPreviousEntities] = 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 = previousEntities.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);
+        setPreviousEntities(entities);
       }
     },
     [
@@ -75,7 +79,9 @@ function useSearch({ queryKey, resultKeys, entities = [], fields }) {
       previousOffset,
       getSearchResults,
       entities,
-      fields
+      fields,
+      entities.length,
+      previousEntities.length
     ]
   );
 

package/src/components/useSearchResults/useSearchResults.js

@@ -2,6 +2,8 @@ import { useState, useEffect } from 'react';
 import useSearch from '../useSearch';
 
 function useSearchResults({ queryKey, resultKeys, entities, fields }) {
+  const [currentResults, setCurrentResults] = useState([]);
+  const [allResults, setAllResults] = useState([]);
   const [
     {
       searchedValue,
@@ -10,8 +12,6 @@ function useSearchResults({ queryKey, resultKeys, entities, fields }) {
     },
     setParams
   ] = useSearch({ queryKey, resultKeys, entities, fields });
-  const [currentResults, setCurrentResults] = useState([]);
-  const [allResults, setAllResults] = useState([]);
 
   useEffect(
     () => {
@@ -20,7 +20,7 @@ function useSearchResults({ queryKey, resultKeys, entities, fields }) {
         setCurrentResults(results);
       }
     },
-    [allResults, currentResults, currentResults.length, results]
+    [allResults, currentResults, results]
   );
 
   const clearList = params => {
@@ -31,7 +31,6 @@ function useSearchResults({ queryKey, resultKeys, entities, fields }) {
   const setQueryParams = params => {
     params.value !== searchedValue ? clearList(params) : setParams(params);
   };
-
   return [{ loading, results: allResults, total }, setQueryParams];
 }