@blaze-cms/plugin-search-ui 0.133.0 → 0.134.0-core-styles.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (32) hide show
  1. package/CHANGELOG.md +27 -0
  2. package/lib/components/SearchAdmin/SearchAdmin.js +71 -21
  3. package/lib/components/SearchAdmin/SearchAdmin.js.map +1 -1
  4. package/lib/components/SearchAdmin/SearchAdminSideBar/SearchAdminSideBar.js +112 -0
  5. package/lib/components/SearchAdmin/SearchAdminSideBar/SearchAdminSideBar.js.map +1 -0
  6. package/lib/components/SearchAdmin/SearchAdminSideBar/index.js +12 -0
  7. package/lib/components/SearchAdmin/SearchAdminSideBar/index.js.map +1 -0
  8. package/lib/components/SearchAdmin/SearchResults/SearchResults.js +81 -29
  9. package/lib/components/SearchAdmin/SearchResults/SearchResults.js.map +1 -1
  10. package/lib/components/useSearch/useSearch.js +13 -7
  11. package/lib/components/useSearch/useSearch.js.map +1 -1
  12. package/lib/components/useSearchResults/useSearchResults.js +13 -11
  13. package/lib/components/useSearchResults/useSearchResults.js.map +1 -1
  14. package/lib-es/components/SearchAdmin/SearchAdmin.js +44 -12
  15. package/lib-es/components/SearchAdmin/SearchAdmin.js.map +1 -1
  16. package/lib-es/components/SearchAdmin/SearchAdminSideBar/SearchAdminSideBar.js +76 -0
  17. package/lib-es/components/SearchAdmin/SearchAdminSideBar/SearchAdminSideBar.js.map +1 -0
  18. package/lib-es/components/SearchAdmin/SearchAdminSideBar/index.js +3 -0
  19. package/lib-es/components/SearchAdmin/SearchAdminSideBar/index.js.map +1 -0
  20. package/lib-es/components/SearchAdmin/SearchResults/SearchResults.js +54 -14
  21. package/lib-es/components/SearchAdmin/SearchResults/SearchResults.js.map +1 -1
  22. package/lib-es/components/useSearch/useSearch.js +7 -4
  23. package/lib-es/components/useSearch/useSearch.js.map +1 -1
  24. package/lib-es/components/useSearchResults/useSearchResults.js +7 -5
  25. package/lib-es/components/useSearchResults/useSearchResults.js.map +1 -1
  26. package/package.json +6 -6
  27. package/src/components/SearchAdmin/SearchAdmin.js +64 -42
  28. package/src/components/SearchAdmin/SearchAdminSideBar/SearchAdminSideBar.js +88 -0
  29. package/src/components/SearchAdmin/SearchAdminSideBar/index.js +3 -0
  30. package/src/components/SearchAdmin/SearchResults/SearchResults.js +122 -44
  31. package/src/components/useSearch/useSearch.js +6 -1
  32. package/src/components/useSearchResults/useSearchResults.js +13 -4
@@ -1,12 +1,13 @@
1
1
  /* eslint-disable jsx-a11y/anchor-is-valid */
2
2
  /* eslint-disable jsx-a11y/no-static-element-interactions */
3
- import React, { useState } from 'react';
3
+ import React, { useState, useEffect } from 'react';
4
4
  import PropTypes from 'prop-types';
5
5
  import VirtualList from 'react-tiny-virtual-list';
6
6
  import { withRouter } from 'react-router-dom';
7
7
  import { SEARCH_RESULTS_OVER_SCAN_BUFFER, SEARCH_RESULTS_ELEMETS_HEIGHT_ABOVE_LIST, SEARCH_RESULTS_ITEM_SIZE, FILE } from '../../../constants';
8
8
  const SearchResults = ({
9
9
  currentValue,
10
+ entities,
10
11
  loading,
11
12
  results,
12
13
  total,
@@ -16,15 +17,36 @@ const SearchResults = ({
16
17
  }) => {
17
18
  const [verifiedRanges, setVerifiedRanges] = useState([]);
18
19
  const [currentIndex, setCurrentIndex] = useState(0);
20
+ const [currentResults, setCurrentResults] = useState('');
21
+ const [allResults, setAllResults] = useState([]);
22
+ const [currentParams, setCurrentParams] = useState('');
23
+ useEffect(() => {
24
+ if (!loading) {
25
+ const newResults = results.map(({
26
+ id
27
+ }) => id).join(',');
28
+ if (currentResults !== newResults) {
29
+ const newParams = `${currentValue},${entities.join(',')}`;
30
+ if (newParams !== currentParams) {
31
+ setAllResults(results);
32
+ setCurrentParams(newParams);
33
+ if (verifiedRanges.length) setVerifiedRanges([]);
34
+ } else {
35
+ setAllResults(allResults.concat(results));
36
+ }
37
+ setCurrentResults(newResults);
38
+ }
39
+ }
40
+ }, [allResults, currentParams, currentResults, currentValue, entities, loading, results, total, verifiedRanges.length]);
19
41
  const handleRenderedItems = async ({
20
42
  startIndex
21
43
  }) => {
22
- const rowsLength = results.length;
44
+ const rowsLength = allResults.length;
23
45
  const loadIndex = Math.floor(rowsLength / 2) - SEARCH_RESULTS_OVER_SCAN_BUFFER;
24
46
  if (loadIndex > 0 && loadIndex < startIndex && !verifiedRanges.includes(loadIndex)) {
25
47
  setQueryParams({
26
48
  value: currentValue,
27
- offset: results.length
49
+ offset: allResults.length
28
50
  });
29
51
  setVerifiedRanges([...verifiedRanges, loadIndex]);
30
52
  setCurrentIndex(startIndex + SEARCH_RESULTS_OVER_SCAN_BUFFER);
@@ -51,14 +73,21 @@ const SearchResults = ({
51
73
  const year = String(newDate.getYear()).slice(-2);
52
74
  return `${day}.${month}.${year}`;
53
75
  };
54
- return /*#__PURE__*/React.createElement(React.Fragment, null, loading && /*#__PURE__*/React.createElement("span", null, "Loading..."), /*#__PURE__*/React.createElement("div", {
76
+ if (!allResults.length) return /*#__PURE__*/React.createElement("div", {
77
+ className: "list list--search"
78
+ }, /*#__PURE__*/React.createElement("div", {
79
+ className: "header header--list"
80
+ }, /*#__PURE__*/React.createElement("h2", null, "No Results")));
81
+ return /*#__PURE__*/React.createElement("div", {
55
82
  className: "modal__content modal__content--search"
56
83
  }, /*#__PURE__*/React.createElement("div", {
57
84
  className: "header header--list"
58
- }, /*#__PURE__*/React.createElement("h2", null, total, " results")), /*#__PURE__*/React.createElement(VirtualList, {
85
+ }, /*#__PURE__*/React.createElement("h2", {
86
+ className: "header--list--results"
87
+ }, "About ", /*#__PURE__*/React.createElement("b", null, total), " search keywords results")), /*#__PURE__*/React.createElement(VirtualList, {
59
88
  width: "100%",
60
89
  height: window.innerHeight - SEARCH_RESULTS_ELEMETS_HEIGHT_ABOVE_LIST,
61
- itemCount: results.length,
90
+ itemCount: allResults.length,
62
91
  itemSize: SEARCH_RESULTS_ITEM_SIZE,
63
92
  overscanCount: SEARCH_RESULTS_OVER_SCAN_BUFFER,
64
93
  scrollToIndex: currentIndex,
@@ -71,9 +100,15 @@ const SearchResults = ({
71
100
  id,
72
101
  docType,
73
102
  updated,
74
- name
75
- } = results[index];
103
+ name,
104
+ entityIdentifier,
105
+ published,
106
+ created,
107
+ status
108
+ } = allResults[index];
76
109
  const updatedDate = updated ? getDateFormat(updated) : null;
110
+ const createdDate = created ? getDateFormat(created) : null;
111
+ const publishedDate = published ? getDateFormat(published) : null;
77
112
  return /*#__PURE__*/React.createElement("div", {
78
113
  key: index,
79
114
  style: style,
@@ -83,8 +118,8 @@ const SearchResults = ({
83
118
  }, /*#__PURE__*/React.createElement("div", {
84
119
  className: "list__item-row list__item-row--result"
85
120
  }, /*#__PURE__*/React.createElement("span", {
86
- className: "badge badge--primary"
87
- }, docType, " ", updatedDate), /*#__PURE__*/React.createElement("a", {
121
+ className: "list__item-identifier"
122
+ }, entityIdentifier), /*#__PURE__*/React.createElement("a", {
88
123
  href: getNavigationRoute({
89
124
  id,
90
125
  docType
@@ -93,10 +128,14 @@ const SearchResults = ({
93
128
  id,
94
129
  docType
95
130
  }),
96
- className: "list__item-text list__item-text--result"
97
- }, name))));
131
+ className: "list__item-link"
132
+ }, name), /*#__PURE__*/React.createElement("div", {
133
+ className: "list__item-dates"
134
+ }, publishedDate && /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement("b", null, "Published: "), publishedDate), /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement("b", null, "Created: "), createdDate), /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement("b", null, "Updated: "), updatedDate)), /*#__PURE__*/React.createElement("div", {
135
+ className: "list__item-status"
136
+ }, status && /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement("b", null, "Status: "), status)))));
98
137
  }
99
- })));
138
+ }), loading && /*#__PURE__*/React.createElement("span", null, "Loading..."));
100
139
  };
101
140
  SearchResults.propTypes = {
102
141
  loading: PropTypes.bool.isRequired,
@@ -105,7 +144,8 @@ SearchResults.propTypes = {
105
144
  setQueryParams: PropTypes.func.isRequired,
106
145
  closeModal: PropTypes.func.isRequired,
107
146
  history: PropTypes.object.isRequired,
108
- currentValue: PropTypes.string.isRequired
147
+ currentValue: PropTypes.string.isRequired,
148
+ entities: PropTypes.array.isRequired
109
149
  };
110
150
  export default withRouter(SearchResults);
111
151
  //# sourceMappingURL=SearchResults.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"SearchResults.js","names":["React","useState","PropTypes","VirtualList","withRouter","SEARCH_RESULTS_OVER_SCAN_BUFFER","SEARCH_RESULTS_ELEMETS_HEIGHT_ABOVE_LIST","SEARCH_RESULTS_ITEM_SIZE","FILE","SearchResults","currentValue","loading","results","total","setQueryParams","closeModal","history","verifiedRanges","setVerifiedRanges","currentIndex","setCurrentIndex","handleRenderedItems","startIndex","rowsLength","length","loadIndex","Math","floor","includes","value","offset","getNavigationRoute","id","docType","navigate","push","getDateFormat","date","newDate","Date","day","getDate","slice","month","getMonth","year","String","getYear","createElement","Fragment","className","width","height","window","innerHeight","itemCount","itemSize","overscanCount","scrollToIndex","onItemsRendered","renderItem","index","style","updated","name","updatedDate","key","href","onClick","propTypes","bool","isRequired","array","number","func","object","string"],"sources":["../../../../src/components/SearchAdmin/SearchResults/SearchResults.js"],"sourcesContent":["/* eslint-disable jsx-a11y/anchor-is-valid */\n/* eslint-disable jsx-a11y/no-static-element-interactions */\nimport React, { useState } from 'react';\nimport PropTypes from 'prop-types';\nimport VirtualList from 'react-tiny-virtual-list';\nimport { withRouter } from 'react-router-dom';\nimport {\n SEARCH_RESULTS_OVER_SCAN_BUFFER,\n SEARCH_RESULTS_ELEMETS_HEIGHT_ABOVE_LIST,\n SEARCH_RESULTS_ITEM_SIZE,\n FILE\n} from '../../../constants';\n\nconst SearchResults = ({\n currentValue,\n loading,\n results,\n total,\n setQueryParams,\n closeModal,\n history\n}) => {\n const [verifiedRanges, setVerifiedRanges] = useState([]);\n const [currentIndex, setCurrentIndex] = useState(0);\n\n const handleRenderedItems = async ({ startIndex }) => {\n const rowsLength = results.length;\n const loadIndex = Math.floor(rowsLength / 2) - SEARCH_RESULTS_OVER_SCAN_BUFFER;\n if (loadIndex > 0 && loadIndex < startIndex && !verifiedRanges.includes(loadIndex)) {\n setQueryParams({ value: currentValue, offset: results.length });\n setVerifiedRanges([...verifiedRanges, loadIndex]);\n setCurrentIndex(startIndex + SEARCH_RESULTS_OVER_SCAN_BUFFER);\n }\n };\n\n const getNavigationRoute = ({ id, docType }) =>\n docType === FILE ? `/media/edit/${id}` : `/data-listing/${docType}/update/${id}`;\n\n const navigate = ({ id, docType }) => {\n history.push(getNavigationRoute({ id, docType }));\n closeModal();\n };\n\n const getDateFormat = date => {\n const newDate = new Date(date);\n const day = `0${newDate.getDate()}`.slice(-2);\n const month = `0${newDate.getMonth() + 1}`.slice(-2);\n const year = String(newDate.getYear()).slice(-2);\n return `${day}.${month}.${year}`;\n };\n\n return (\n <>\n {loading && <span>Loading...</span>}\n <div className=\"modal__content modal__content--search\">\n <div className=\"header header--list\">\n <h2>{total} results</h2>\n </div>\n <VirtualList\n width=\"100%\"\n height={window.innerHeight - SEARCH_RESULTS_ELEMETS_HEIGHT_ABOVE_LIST}\n itemCount={results.length}\n itemSize={SEARCH_RESULTS_ITEM_SIZE}\n overscanCount={SEARCH_RESULTS_OVER_SCAN_BUFFER}\n scrollToIndex={currentIndex}\n onItemsRendered={handleRenderedItems}\n renderItem={({ index, style }) => {\n const { id, docType, updated, name } = results[index];\n const updatedDate = updated ? getDateFormat(updated) : null;\n return (\n <div key={index} style={style} className=\"list__item--resultWrapper\">\n <div className=\"list__item list__item--result\">\n <div className=\"list__item-row list__item-row--result\">\n <span className=\"badge badge--primary\">\n {docType} {updatedDate}\n </span>\n <a\n href={getNavigationRoute({\n id,\n docType\n })}\n onClick={() =>\n navigate({\n id,\n docType\n })\n }\n className=\"list__item-text list__item-text--result\">\n {name}\n </a>\n </div>\n </div>\n </div>\n );\n }}\n />\n </div>\n </>\n );\n};\n\nSearchResults.propTypes = {\n loading: PropTypes.bool.isRequired,\n results: PropTypes.array.isRequired,\n total: PropTypes.number.isRequired,\n setQueryParams: PropTypes.func.isRequired,\n closeModal: PropTypes.func.isRequired,\n history: PropTypes.object.isRequired,\n currentValue: PropTypes.string.isRequired\n};\n\nexport default withRouter(SearchResults);\n"],"mappings":"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"}
1
+ {"version":3,"file":"SearchResults.js","names":["React","useState","useEffect","PropTypes","VirtualList","withRouter","SEARCH_RESULTS_OVER_SCAN_BUFFER","SEARCH_RESULTS_ELEMETS_HEIGHT_ABOVE_LIST","SEARCH_RESULTS_ITEM_SIZE","FILE","SearchResults","currentValue","entities","loading","results","total","setQueryParams","closeModal","history","verifiedRanges","setVerifiedRanges","currentIndex","setCurrentIndex","currentResults","setCurrentResults","allResults","setAllResults","currentParams","setCurrentParams","newResults","map","id","join","newParams","length","concat","handleRenderedItems","startIndex","rowsLength","loadIndex","Math","floor","includes","value","offset","getNavigationRoute","docType","navigate","push","getDateFormat","date","newDate","Date","day","getDate","slice","month","getMonth","year","String","getYear","createElement","className","width","height","window","innerHeight","itemCount","itemSize","overscanCount","scrollToIndex","onItemsRendered","renderItem","index","style","updated","name","entityIdentifier","published","created","status","updatedDate","createdDate","publishedDate","key","href","onClick","propTypes","bool","isRequired","array","number","func","object","string"],"sources":["../../../../src/components/SearchAdmin/SearchResults/SearchResults.js"],"sourcesContent":["/* eslint-disable jsx-a11y/anchor-is-valid */\n/* eslint-disable jsx-a11y/no-static-element-interactions */\nimport React, { useState, useEffect } from 'react';\nimport PropTypes from 'prop-types';\nimport VirtualList from 'react-tiny-virtual-list';\nimport { withRouter } from 'react-router-dom';\nimport {\n SEARCH_RESULTS_OVER_SCAN_BUFFER,\n SEARCH_RESULTS_ELEMETS_HEIGHT_ABOVE_LIST,\n SEARCH_RESULTS_ITEM_SIZE,\n FILE\n} from '../../../constants';\n\nconst SearchResults = ({\n currentValue,\n entities,\n loading,\n results,\n total,\n setQueryParams,\n closeModal,\n history\n}) => {\n const [verifiedRanges, setVerifiedRanges] = useState([]);\n const [currentIndex, setCurrentIndex] = useState(0);\n const [currentResults, setCurrentResults] = useState('');\n const [allResults, setAllResults] = useState([]);\n const [currentParams, setCurrentParams] = useState('');\n\n useEffect(\n () => {\n if (!loading) {\n const newResults = results.map(({ id }) => id).join(',');\n if (currentResults !== newResults) {\n const newParams = `${currentValue},${entities.join(',')}`;\n if (newParams !== currentParams) {\n setAllResults(results);\n setCurrentParams(newParams);\n if (verifiedRanges.length) setVerifiedRanges([]);\n } else {\n setAllResults(allResults.concat(results));\n }\n setCurrentResults(newResults);\n }\n }\n },\n [\n allResults,\n currentParams,\n currentResults,\n currentValue,\n entities,\n loading,\n results,\n total,\n verifiedRanges.length\n ]\n );\n\n const handleRenderedItems = async ({ startIndex }) => {\n const rowsLength = allResults.length;\n const loadIndex = Math.floor(rowsLength / 2) - SEARCH_RESULTS_OVER_SCAN_BUFFER;\n if (loadIndex > 0 && loadIndex < startIndex && !verifiedRanges.includes(loadIndex)) {\n setQueryParams({ value: currentValue, offset: allResults.length });\n setVerifiedRanges([...verifiedRanges, loadIndex]);\n setCurrentIndex(startIndex + SEARCH_RESULTS_OVER_SCAN_BUFFER);\n }\n };\n\n const getNavigationRoute = ({ id, docType }) =>\n docType === FILE ? `/media/edit/${id}` : `/data-listing/${docType}/update/${id}`;\n\n const navigate = ({ id, docType }) => {\n history.push(getNavigationRoute({ id, docType }));\n closeModal();\n };\n\n const getDateFormat = date => {\n const newDate = new Date(date);\n const day = `0${newDate.getDate()}`.slice(-2);\n const month = `0${newDate.getMonth() + 1}`.slice(-2);\n const year = String(newDate.getYear()).slice(-2);\n return `${day}.${month}.${year}`;\n };\n\n if (!allResults.length)\n return (\n <div className=\"list list--search\">\n <div className=\"header header--list\">\n <h2>No Results</h2>\n </div>\n </div>\n );\n\n return (\n <div className=\"modal__content modal__content--search\">\n <div className=\"header header--list\">\n <h2 className=\"header--list--results\">\n About <b>{total}</b> search keywords results\n </h2>\n </div>\n <VirtualList\n width=\"100%\"\n height={window.innerHeight - SEARCH_RESULTS_ELEMETS_HEIGHT_ABOVE_LIST}\n itemCount={allResults.length}\n itemSize={SEARCH_RESULTS_ITEM_SIZE}\n overscanCount={SEARCH_RESULTS_OVER_SCAN_BUFFER}\n scrollToIndex={currentIndex}\n onItemsRendered={handleRenderedItems}\n renderItem={({ index, style }) => {\n const {\n id,\n docType,\n updated,\n name,\n entityIdentifier,\n published,\n created,\n status\n } = allResults[index];\n const updatedDate = updated ? getDateFormat(updated) : null;\n const createdDate = created ? getDateFormat(created) : null;\n const publishedDate = published ? getDateFormat(published) : null;\n return (\n <div key={index} style={style} className=\"list__item--resultWrapper\">\n <div className=\"list__item list__item--result\">\n <div className=\"list__item-row list__item-row--result\">\n <span className=\"list__item-identifier\">{entityIdentifier}</span>\n <a\n href={getNavigationRoute({\n id,\n docType\n })}\n onClick={() =>\n navigate({\n id,\n docType\n })\n }\n className=\"list__item-link\">\n {name}\n </a>\n\n <div className=\"list__item-dates\">\n {publishedDate && (\n <span>\n <b>Published: </b>\n {publishedDate}\n </span>\n )}\n <span>\n <b>Created: </b>\n {createdDate}\n </span>\n <span>\n <b>Updated: </b>\n {updatedDate}\n </span>\n </div>\n <div className=\"list__item-status\">\n {status && (\n <span>\n <b>Status: </b>\n {status}\n </span>\n )}\n </div>\n </div>\n </div>\n </div>\n );\n }}\n />\n {loading && <span>Loading...</span>}\n </div>\n );\n};\n\nSearchResults.propTypes = {\n loading: PropTypes.bool.isRequired,\n results: PropTypes.array.isRequired,\n total: PropTypes.number.isRequired,\n setQueryParams: PropTypes.func.isRequired,\n closeModal: PropTypes.func.isRequired,\n history: PropTypes.object.isRequired,\n currentValue: PropTypes.string.isRequired,\n entities: PropTypes.array.isRequired\n};\n\nexport default withRouter(SearchResults);\n"],"mappings":"AAAA;AACA;AACA,OAAOA,KAAK,IAAIC,QAAQ,EAAEC,SAAS,QAAQ,OAAO;AAClD,OAAOC,SAAS,MAAM,YAAY;AAClC,OAAOC,WAAW,MAAM,yBAAyB;AACjD,SAASC,UAAU,QAAQ,kBAAkB;AAC7C,SACEC,+BAA+B,EAC/BC,wCAAwC,EACxCC,wBAAwB,EACxBC,IAAI,QACC,oBAAoB;AAE3B,MAAMC,aAAa,GAAGA,CAAC;EACrBC,YAAY;EACZC,QAAQ;EACRC,OAAO;EACPC,OAAO;EACPC,KAAK;EACLC,cAAc;EACdC,UAAU;EACVC;AACF,CAAC,KAAK;EACJ,MAAM,CAACC,cAAc,EAAEC,iBAAiB,CAAC,GAAGnB,QAAQ,CAAC,EAAE,CAAC;EACxD,MAAM,CAACoB,YAAY,EAAEC,eAAe,CAAC,GAAGrB,QAAQ,CAAC,CAAC,CAAC;EACnD,MAAM,CAACsB,cAAc,EAAEC,iBAAiB,CAAC,GAAGvB,QAAQ,CAAC,EAAE,CAAC;EACxD,MAAM,CAACwB,UAAU,EAAEC,aAAa,CAAC,GAAGzB,QAAQ,CAAC,EAAE,CAAC;EAChD,MAAM,CAAC0B,aAAa,EAAEC,gBAAgB,CAAC,GAAG3B,QAAQ,CAAC,EAAE,CAAC;EAEtDC,SAAS,CACP,MAAM;IACJ,IAAI,CAACW,OAAO,EAAE;MACZ,MAAMgB,UAAU,GAAGf,OAAO,CAACgB,GAAG,CAAC,CAAC;QAAEC;MAAG,CAAC,KAAKA,EAAE,CAAC,CAACC,IAAI,CAAC,GAAG,CAAC;MACxD,IAAIT,cAAc,KAAKM,UAAU,EAAE;QACjC,MAAMI,SAAS,GAAI,GAAEtB,YAAa,IAAGC,QAAQ,CAACoB,IAAI,CAAC,GAAG,CAAE,EAAC;QACzD,IAAIC,SAAS,KAAKN,aAAa,EAAE;UAC/BD,aAAa,CAACZ,OAAO,CAAC;UACtBc,gBAAgB,CAACK,SAAS,CAAC;UAC3B,IAAId,cAAc,CAACe,MAAM,EAAEd,iBAAiB,CAAC,EAAE,CAAC;QAClD,CAAC,MAAM;UACLM,aAAa,CAACD,UAAU,CAACU,MAAM,CAACrB,OAAO,CAAC,CAAC;QAC3C;QACAU,iBAAiB,CAACK,UAAU,CAAC;MAC/B;IACF;EACF,CAAC,EACD,CACEJ,UAAU,EACVE,aAAa,EACbJ,cAAc,EACdZ,YAAY,EACZC,QAAQ,EACRC,OAAO,EACPC,OAAO,EACPC,KAAK,EACLI,cAAc,CAACe,MAAM,CAEzB,CAAC;EAED,MAAME,mBAAmB,GAAG,MAAAA,CAAO;IAAEC;EAAW,CAAC,KAAK;IACpD,MAAMC,UAAU,GAAGb,UAAU,CAACS,MAAM;IACpC,MAAMK,SAAS,GAAGC,IAAI,CAACC,KAAK,CAACH,UAAU,GAAG,CAAC,CAAC,GAAGhC,+BAA+B;IAC9E,IAAIiC,SAAS,GAAG,CAAC,IAAIA,SAAS,GAAGF,UAAU,IAAI,CAAClB,cAAc,CAACuB,QAAQ,CAACH,SAAS,CAAC,EAAE;MAClFvB,cAAc,CAAC;QAAE2B,KAAK,EAAEhC,YAAY;QAAEiC,MAAM,EAAEnB,UAAU,CAACS;MAAO,CAAC,CAAC;MAClEd,iBAAiB,CAAC,CAAC,GAAGD,cAAc,EAAEoB,SAAS,CAAC,CAAC;MACjDjB,eAAe,CAACe,UAAU,GAAG/B,+BAA+B,CAAC;IAC/D;EACF,CAAC;EAED,MAAMuC,kBAAkB,GAAGA,CAAC;IAAEd,EAAE;IAAEe;EAAQ,CAAC,KACzCA,OAAO,KAAKrC,IAAI,GAAI,eAAcsB,EAAG,EAAC,GAAI,iBAAgBe,OAAQ,WAAUf,EAAG,EAAC;EAElF,MAAMgB,QAAQ,GAAGA,CAAC;IAAEhB,EAAE;IAAEe;EAAQ,CAAC,KAAK;IACpC5B,OAAO,CAAC8B,IAAI,CAACH,kBAAkB,CAAC;MAAEd,EAAE;MAAEe;IAAQ,CAAC,CAAC,CAAC;IACjD7B,UAAU,CAAC,CAAC;EACd,CAAC;EAED,MAAMgC,aAAa,GAAGC,IAAI,IAAI;IAC5B,MAAMC,OAAO,GAAG,IAAIC,IAAI,CAACF,IAAI,CAAC;IAC9B,MAAMG,GAAG,GAAI,IAAGF,OAAO,CAACG,OAAO,CAAC,CAAE,EAAC,CAACC,KAAK,CAAC,CAAC,CAAC,CAAC;IAC7C,MAAMC,KAAK,GAAI,IAAGL,OAAO,CAACM,QAAQ,CAAC,CAAC,GAAG,CAAE,EAAC,CAACF,KAAK,CAAC,CAAC,CAAC,CAAC;IACpD,MAAMG,IAAI,GAAGC,MAAM,CAACR,OAAO,CAACS,OAAO,CAAC,CAAC,CAAC,CAACL,KAAK,CAAC,CAAC,CAAC,CAAC;IAChD,OAAQ,GAAEF,GAAI,IAAGG,KAAM,IAAGE,IAAK,EAAC;EAClC,CAAC;EAED,IAAI,CAACjC,UAAU,CAACS,MAAM,EACpB,oBACElC,KAAA,CAAA6D,aAAA;IAAKC,SAAS,EAAC;EAAmB,gBAChC9D,KAAA,CAAA6D,aAAA;IAAKC,SAAS,EAAC;EAAqB,gBAClC9D,KAAA,CAAA6D,aAAA,aAAI,YAAc,CACf,CACF,CAAC;EAGV,oBACE7D,KAAA,CAAA6D,aAAA;IAAKC,SAAS,EAAC;EAAuC,gBACpD9D,KAAA,CAAA6D,aAAA;IAAKC,SAAS,EAAC;EAAqB,gBAClC9D,KAAA,CAAA6D,aAAA;IAAIC,SAAS,EAAC;EAAuB,GAAC,QAC9B,eAAA9D,KAAA,CAAA6D,aAAA,YAAI9C,KAAS,CAAC,4BAClB,CACD,CAAC,eACNf,KAAA,CAAA6D,aAAA,CAACzD,WAAW;IACV2D,KAAK,EAAC,MAAM;IACZC,MAAM,EAAEC,MAAM,CAACC,WAAW,GAAG3D,wCAAyC;IACtE4D,SAAS,EAAE1C,UAAU,CAACS,MAAO;IAC7BkC,QAAQ,EAAE5D,wBAAyB;IACnC6D,aAAa,EAAE/D,+BAAgC;IAC/CgE,aAAa,EAAEjD,YAAa;IAC5BkD,eAAe,EAAEnC,mBAAoB;IACrCoC,UAAU,EAAEA,CAAC;MAAEC,KAAK;MAAEC;IAAM,CAAC,KAAK;MAChC,MAAM;QACJ3C,EAAE;QACFe,OAAO;QACP6B,OAAO;QACPC,IAAI;QACJC,gBAAgB;QAChBC,SAAS;QACTC,OAAO;QACPC;MACF,CAAC,GAAGvD,UAAU,CAACgD,KAAK,CAAC;MACrB,MAAMQ,WAAW,GAAGN,OAAO,GAAG1B,aAAa,CAAC0B,OAAO,CAAC,GAAG,IAAI;MAC3D,MAAMO,WAAW,GAAGH,OAAO,GAAG9B,aAAa,CAAC8B,OAAO,CAAC,GAAG,IAAI;MAC3D,MAAMI,aAAa,GAAGL,SAAS,GAAG7B,aAAa,CAAC6B,SAAS,CAAC,GAAG,IAAI;MACjE,oBACE9E,KAAA,CAAA6D,aAAA;QAAKuB,GAAG,EAAEX,KAAM;QAACC,KAAK,EAAEA,KAAM;QAACZ,SAAS,EAAC;MAA2B,gBAClE9D,KAAA,CAAA6D,aAAA;QAAKC,SAAS,EAAC;MAA+B,gBAC5C9D,KAAA,CAAA6D,aAAA;QAAKC,SAAS,EAAC;MAAuC,gBACpD9D,KAAA,CAAA6D,aAAA;QAAMC,SAAS,EAAC;MAAuB,GAAEe,gBAAuB,CAAC,eACjE7E,KAAA,CAAA6D,aAAA;QACEwB,IAAI,EAAExC,kBAAkB,CAAC;UACvBd,EAAE;UACFe;QACF,CAAC,CAAE;QACHwC,OAAO,EAAEA,CAAA,KACPvC,QAAQ,CAAC;UACPhB,EAAE;UACFe;QACF,CAAC,CACF;QACDgB,SAAS,EAAC;MAAiB,GAC1Bc,IACA,CAAC,eAEJ5E,KAAA,CAAA6D,aAAA;QAAKC,SAAS,EAAC;MAAkB,GAC9BqB,aAAa,iBACZnF,KAAA,CAAA6D,aAAA,4BACE7D,KAAA,CAAA6D,aAAA,YAAG,aAAc,CAAC,EACjBsB,aACG,CACP,eACDnF,KAAA,CAAA6D,aAAA,4BACE7D,KAAA,CAAA6D,aAAA,YAAG,WAAY,CAAC,EACfqB,WACG,CAAC,eACPlF,KAAA,CAAA6D,aAAA,4BACE7D,KAAA,CAAA6D,aAAA,YAAG,WAAY,CAAC,EACfoB,WACG,CACH,CAAC,eACNjF,KAAA,CAAA6D,aAAA;QAAKC,SAAS,EAAC;MAAmB,GAC/BkB,MAAM,iBACLhF,KAAA,CAAA6D,aAAA,4BACE7D,KAAA,CAAA6D,aAAA,YAAG,UAAW,CAAC,EACdmB,MACG,CAEL,CACF,CACF,CACF,CAAC;IAEV;EAAE,CACH,CAAC,EACDnE,OAAO,iBAAIb,KAAA,CAAA6D,aAAA,eAAM,YAAgB,CAC/B,CAAC;AAEV,CAAC;AAEDnD,aAAa,CAAC6E,SAAS,GAAG;EACxB1E,OAAO,EAAEV,SAAS,CAACqF,IAAI,CAACC,UAAU;EAClC3E,OAAO,EAAEX,SAAS,CAACuF,KAAK,CAACD,UAAU;EACnC1E,KAAK,EAAEZ,SAAS,CAACwF,MAAM,CAACF,UAAU;EAClCzE,cAAc,EAAEb,SAAS,CAACyF,IAAI,CAACH,UAAU;EACzCxE,UAAU,EAAEd,SAAS,CAACyF,IAAI,CAACH,UAAU;EACrCvE,OAAO,EAAEf,SAAS,CAAC0F,MAAM,CAACJ,UAAU;EACpC9E,YAAY,EAAER,SAAS,CAAC2F,MAAM,CAACL,UAAU;EACzC7E,QAAQ,EAAET,SAAS,CAACuF,KAAK,CAACD;AAC5B,CAAC;AAED,eAAepF,UAAU,CAACK,aAAa,CAAC"}
@@ -1,6 +1,6 @@
1
1
  import _defineProperty from "@babel/runtime/helpers/defineProperty";
2
- function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
3
- function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
2
+ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
3
+ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
4
4
  import { useState, useEffect } from 'react';
5
5
  import { useLazyQuery } from '@apollo/client';
6
6
  import searchQueries from '../../application/query';
@@ -17,6 +17,7 @@ function useSearch({
17
17
  value: ''
18
18
  });
19
19
  const [searchedValue, setSearchedValue] = useState(null);
20
+ const [previousEntities, setPreviousEntities] = useState([]);
20
21
  const [previousOffset, setPreviousOffset] = useState(null);
21
22
  const buildSearchQuery = searchQueries[queryKey];
22
23
  const [getSearchResults, {
@@ -55,12 +56,13 @@ function useSearch({
55
56
  } = queryParams;
56
57
  const isNewValueSet = value && value !== searchedValue;
57
58
  const isNewOffsetSet = previousOffset !== null && offset !== previousOffset;
59
+ const notSameLength = previousEntities.length !== entities.length;
58
60
  const parsedEntities = entities.length ? entities.map(entity => ({
59
61
  match: {
60
62
  docType: entity
61
63
  }
62
64
  })) : [];
63
- if (isNewValueSet || isNewOffsetSet) {
65
+ if (isNewValueSet || isNewOffsetSet || notSameLength) {
64
66
  getSearchResults({
65
67
  variables: {
66
68
  limit,
@@ -88,8 +90,9 @@ function useSearch({
88
90
  });
89
91
  setSearchedValue(value);
90
92
  setPreviousOffset(offset);
93
+ setPreviousEntities(entities);
91
94
  }
92
- }, [queryParams, queryParams.limit, queryParams.value, queryParams.offset, searchedValue, previousOffset, getSearchResults, entities, fields, extraFilters]);
95
+ }, [queryParams, queryParams.limit, queryParams.value, queryParams.offset, searchedValue, previousOffset, getSearchResults, entities, fields, entities.length, previousEntities.length, extraFilters]);
93
96
  return [{
94
97
  searchedValue: queryParams.value,
95
98
  loading,
@@ -1 +1 @@
1
- {"version":3,"file":"useSearch.js","names":["useState","useEffect","useLazyQuery","searchQueries","useSearch","queryKey","resultKeys","entities","fields","extraFilters","queryParams","setParams","limit","offset","value","searchedValue","setSearchedValue","previousOffset","setPreviousOffset","buildSearchQuery","getSearchResults","loading","data","ssr","search","defaultSearch","results","jsonResults","total","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, extraFilters }) {\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\n const [getSearchResults, { loading, data = {} } = {}] = useLazyQuery(\n buildSearchQuery({ resultKeys }),\n { ssr: false }\n );\n\n const { search } = data;\n\n const defaultSearch = {\n results: [],\n jsonResults: null,\n total: 0\n };\n\n const { results, jsonResults, total } = search ?? defaultSearch;\n\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 extraFilters\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 extraFilters\n ]\n );\n\n return [\n { searchedValue: queryParams.value, loading, data: { results: results || jsonResults, total } },\n handleQueryParams\n ];\n}\n\nexport default useSearch;\n"],"mappings":"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"}
1
+ {"version":3,"file":"useSearch.js","names":["useState","useEffect","useLazyQuery","searchQueries","useSearch","queryKey","resultKeys","entities","fields","extraFilters","queryParams","setParams","limit","offset","value","searchedValue","setSearchedValue","previousEntities","setPreviousEntities","previousOffset","setPreviousOffset","buildSearchQuery","getSearchResults","loading","data","ssr","search","defaultSearch","results","jsonResults","total","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, extraFilters }) {\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 [getSearchResults, { loading, data = {} } = {}] = useLazyQuery(\n buildSearchQuery({ resultKeys }),\n { ssr: false }\n );\n\n const { search } = data;\n\n const defaultSearch = {\n results: [],\n jsonResults: null,\n total: 0\n };\n\n const { results, jsonResults, total } = search ?? defaultSearch;\n\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 extraFilters\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 extraFilters\n ]\n );\n\n return [\n { searchedValue: queryParams.value, loading, data: { results: results || jsonResults, total } },\n handleQueryParams\n ];\n}\n\nexport default useSearch;\n"],"mappings":"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"}
@@ -1,6 +1,6 @@
1
1
  import _defineProperty from "@babel/runtime/helpers/defineProperty";
2
- function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
3
- function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
2
+ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
3
+ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
4
4
  import { useState, useEffect } from 'react';
5
5
  import useSearch from '../useSearch';
6
6
  function useSearchResults({
@@ -9,6 +9,8 @@ function useSearchResults({
9
9
  entities,
10
10
  fields
11
11
  }) {
12
+ const [currentResults, setCurrentResults] = useState([]);
13
+ const [allResults, setAllResults] = useState([]);
12
14
  const [{
13
15
  searchedValue,
14
16
  loading,
@@ -22,14 +24,12 @@ function useSearchResults({
22
24
  entities,
23
25
  fields
24
26
  });
25
- const [currentResults, setCurrentResults] = useState([]);
26
- const [allResults, setAllResults] = useState([]);
27
27
  useEffect(() => {
28
28
  if (currentResults.length !== results.length) {
29
29
  setAllResults([...allResults, ...results]);
30
30
  setCurrentResults(results);
31
31
  }
32
- }, [allResults, currentResults, currentResults.length, results]);
32
+ }, [allResults, currentResults, results]);
33
33
  const clearList = params => {
34
34
  setAllResults([]);
35
35
  setParams(_objectSpread(_objectSpread({}, params), {}, {
@@ -42,6 +42,8 @@ function useSearchResults({
42
42
  return [{
43
43
  loading,
44
44
  results: allResults,
45
+ currentResults,
46
+ newResults: results,
45
47
  total
46
48
  }, setQueryParams];
47
49
  }
@@ -1 +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"}
1
+ {"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","newResults"],"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\n return [\n {\n loading,\n results: allResults,\n currentResults,\n newResults: results,\n total\n },\n setQueryParams\n ];\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;EAED,OAAO,CACL;IACEP,OAAO;IACPE,OAAO,EAAEL,UAAU;IACnBF,cAAc;IACdiB,UAAU,EAAEV,OAAO;IACnBC;EACF,CAAC,EACDO,cAAc,CACf;AACH;AAEA,eAAepB,gBAAgB"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@blaze-cms/plugin-search-ui",
3
- "version": "0.133.0",
3
+ "version": "0.134.0-core-styles.0",
4
4
  "description": "Blaze plugin search ui",
5
5
  "main": "lib/index.js",
6
6
  "module": "lib-es/index.js",
@@ -27,9 +27,9 @@
27
27
  },
28
28
  "license": "GPL-3.0",
29
29
  "dependencies": {
30
- "@blaze-cms/admin-ui-utils": "^0.132.0",
31
- "@blaze-cms/core-errors": "^0.131.0",
32
- "@blaze-cms/setup-ui": "^0.131.0",
30
+ "@blaze-cms/admin-ui-utils": "0.134.0-core-styles.0",
31
+ "@blaze-cms/core-errors": "0.134.0-core-styles.0",
32
+ "@blaze-cms/setup-ui": "0.134.0-core-styles.0",
33
33
  "@blaze-react/button": "0.5.19",
34
34
  "@blaze-react/input": "0.5.30",
35
35
  "@blaze-react/utils": "0.5.15",
@@ -40,7 +40,7 @@
40
40
  "react-tiny-virtual-list": "2.2.0"
41
41
  },
42
42
  "devDependencies": {
43
- "@blaze-cms/core-ui": "^0.131.0"
43
+ "@blaze-cms/core-ui": "0.134.0-core-styles.0"
44
44
  },
45
45
  "peerDependencies": {
46
46
  "@apollo/client": "3.x",
@@ -52,5 +52,5 @@
52
52
  "lib/*",
53
53
  "lib-es/*"
54
54
  ],
55
- "gitHead": "d1265256eafcf99954599ab9b12d1cc165929cb9"
55
+ "gitHead": "82f3090699d18c3a02cbfe86a4ec96b5c558d6fa"
56
56
  }
@@ -1,21 +1,28 @@
1
1
  import React, { useState, useRef, useEffect } from 'react';
2
2
  import classnames from 'classnames';
3
+ import { useDebounce } from '@blaze-react/utils/lib/customHooks';
3
4
  import useLocalStorage from '../useLocalStorage';
4
5
  import SearchBar from './SearchBar';
5
6
  import RecentSearches from './RecentSearches';
6
7
  import SearchResults from './SearchResults';
7
8
  import TriggerModal from './TriggerModal';
9
+ import SearchAdminSideBar from './SearchAdminSideBar';
8
10
  import useSearchResults from '../useSearchResults';
9
11
  import { SEARCH_ADMIN } from '../../constants';
10
12
 
11
13
  const SearchAdmin = () => {
12
14
  const [searchTerm, setSearchTerm] = useState('');
15
+ const [openSearchSideBar, setOpenSearchSideBar] = useState(true);
16
+ const [entityValues, setEntityValues] = useState([]);
13
17
  const [recentSearches, setRecentSearches] = useLocalStorage('recentSearches', []);
14
18
  const [displaySearchModalFrame, setDisplaySearchModalFrame] = useState(false);
15
19
  const [enableResults, setEnableResults] = useState(true);
16
20
  const searchInputRef = useRef(null);
17
- const [{ loading, results, total }, setQueryParams] = useSearchResults({
18
- queryKey: SEARCH_ADMIN
21
+ const debouncedEntityValues = useDebounce(entityValues, 500);
22
+ const entities = debouncedEntityValues.map(e => e.id);
23
+ const [{ loading, newResults: results = [], total }, setQueryParams] = useSearchResults({
24
+ queryKey: SEARCH_ADMIN,
25
+ entities
19
26
  });
20
27
 
21
28
  useEffect(
@@ -30,11 +37,13 @@ const SearchAdmin = () => {
30
37
  const handleSearchTerm = ({ target: { value } }) => {
31
38
  setSearchTerm(value);
32
39
  };
40
+
33
41
  const toggleSearchModal = () => {
34
42
  setSearchTerm(null);
35
43
  setEnableResults(false);
36
44
  setDisplaySearchModalFrame(!displaySearchModalFrame);
37
45
  };
46
+
38
47
  const search = ({ value }) => {
39
48
  if (!value) return;
40
49
  !enableResults && setEnableResults(true);
@@ -68,58 +77,71 @@ const SearchAdmin = () => {
68
77
  'modal--show': displaySearchModalFrame
69
78
  });
70
79
 
80
+ const searchModalSideBarClassName = classnames('modal__search__sidebar', {
81
+ 'modal__search__sidebar--close': !openSearchSideBar
82
+ });
83
+
71
84
  const isEmptySearchTermAndData = !searchTerm && !results.length;
72
85
  const isEmptySearchTermnAndDisabledResults = !searchTerm && !enableResults;
73
86
  const shouldDisplayRecentSearches =
74
87
  isEmptySearchTermAndData || isEmptySearchTermnAndDisabledResults;
75
88
 
76
- const showResults = enableResults && results.length;
89
+ const handleSetEntityValues = newEntity => {
90
+ const entityExists = entityValues.some(entity => entity.id === newEntity.id);
91
+ if (entityExists) {
92
+ setQueryParams({ value: searchTerm, offset: 0 });
93
+ setEntityValues(entityValues.filter(entity => entity.id !== newEntity.id));
94
+ } else {
95
+ setQueryParams({ value: searchTerm, offset: 0 });
96
+ setEntityValues([...entityValues, newEntity]);
97
+ }
98
+ };
77
99
 
78
100
  return (
79
101
  <div className="search search--header">
80
102
  <TriggerModal toggleSearchModal={toggleSearchModal} />
81
103
  <div className={searchModalResultsClassName}>
82
104
  {displaySearchModalFrame && (
83
- <>
84
- <div className="modal__header modal__header--search">
85
- <SearchBar
86
- toggleSearchModal={toggleSearchModal}
87
- handleKeyDown={handleKeyDown}
88
- searchInputRef={searchInputRef}
89
- handleSearchTerm={handleSearchTerm}
90
- searchTerm={searchTerm}
91
- search={() => search({ value: searchTerm })}
92
- />
105
+ <div className="modal__search">
106
+ <SearchAdminSideBar
107
+ searchModalSideBarClassName={searchModalSideBarClassName}
108
+ openSearchSideBar={openSearchSideBar}
109
+ setOpenSearchSideBar={setOpenSearchSideBar}
110
+ handleSetEntityValues={handleSetEntityValues}
111
+ entityValues={entityValues}
112
+ setEntityValues={setEntityValues}
113
+ />
114
+ <div className="modal__search__content">
115
+ <div className="modal__header modal__header--search">
116
+ <SearchBar
117
+ toggleSearchModal={toggleSearchModal}
118
+ handleKeyDown={handleKeyDown}
119
+ searchInputRef={searchInputRef}
120
+ handleSearchTerm={handleSearchTerm}
121
+ searchTerm={searchTerm}
122
+ search={() => search({ value: searchTerm })}
123
+ />
124
+ </div>
125
+ {shouldDisplayRecentSearches && (
126
+ <RecentSearches
127
+ recentSearches={recentSearches}
128
+ handleSearchTerm={handleSearchTerm}
129
+ search={search}
130
+ />
131
+ )}
132
+ {enableResults && (
133
+ <SearchResults
134
+ currentValue={searchTerm}
135
+ entities={entities}
136
+ loading={loading}
137
+ results={results}
138
+ total={total}
139
+ setQueryParams={setQueryParams}
140
+ closeModal={toggleSearchModal}
141
+ />
142
+ )}
93
143
  </div>
94
- {shouldDisplayRecentSearches ? (
95
- <RecentSearches
96
- recentSearches={recentSearches}
97
- handleSearchTerm={handleSearchTerm}
98
- search={search}
99
- />
100
- ) : (
101
- <>
102
- {!showResults && (
103
- <div className="list list--search">
104
- <div className="header header--list">
105
- <h2>No Results</h2>
106
- </div>
107
- </div>
108
- )}
109
- </>
110
- )}
111
- {showResults && (
112
- <SearchResults
113
- currentValue={searchTerm}
114
- searchTerm={searchTerm}
115
- loading={loading}
116
- results={results}
117
- total={total}
118
- setQueryParams={setQueryParams}
119
- closeModal={toggleSearchModal}
120
- />
121
- )}
122
- </>
144
+ </div>
123
145
  )}
124
146
  </div>
125
147
  </div>
@@ -0,0 +1,88 @@
1
+ import React, { useState } from 'react';
2
+ import { useQuery } from '@apollo/client';
3
+ import { getQuery } from '@blaze-cms/admin-ui-utils';
4
+ import { Checkbox } from '@blaze-react/checkboxes';
5
+
6
+ const MENU_PERMISSIONS = ['update:any', 'update:own', 'create:any', 'create:own'];
7
+
8
+ const SearchAdminSideBar = ({
9
+ searchModalSideBarClassName,
10
+ openSearchSideBar,
11
+ setOpenSearchSideBar,
12
+ handleSetEntityValues,
13
+ entityValues,
14
+ setEntityValues
15
+ }) => {
16
+ const [loadMore, setLoadMore] = useState(false);
17
+ const { data: { getEntitySchemas = [] } = {}, loading } = useQuery(
18
+ getQuery('GET_USER_EDITABLE_ENTITIES'),
19
+ {
20
+ variables: {
21
+ canDoActions: MENU_PERMISSIONS
22
+ }
23
+ }
24
+ );
25
+
26
+ if (loading) return null;
27
+
28
+ const filteredEntitiesSchemas = getEntitySchemas.filter(entity => {
29
+ if (entity.extras && entity.extras.searchIndexes) {
30
+ return entity.extras.searchIndexes.includes('admin');
31
+ }
32
+ return false;
33
+ });
34
+
35
+ const entitiesToShow = filteredEntitiesSchemas.slice(
36
+ 0,
37
+ loadMore ? filteredEntitiesSchemas.length : 5
38
+ );
39
+
40
+ return (
41
+ <div className={searchModalSideBarClassName}>
42
+ <div
43
+ className="modal__search__sidebar__button"
44
+ role="button"
45
+ onClick={() => setOpenSearchSideBar(!openSearchSideBar)}>
46
+ <i className="material-icons">
47
+ {openSearchSideBar ? 'keyboard_arrow_left' : 'keyboard_arrow_right'}
48
+ </i>
49
+ </div>
50
+ <div className="modal__search__sidebar__container">
51
+ <div className="modal__search__sidebar__wrapper">
52
+ <div className="modal__search__sidebar__filters">
53
+ <i className="material-icons modal__search__sidebar__icon">tune</i>
54
+ <span>Filters</span>
55
+ </div>
56
+ <div
57
+ className="modal__search__sidebar__clear"
58
+ role="button"
59
+ onClick={() => setEntityValues([])}>
60
+ <span>Clear all</span>
61
+ <i className="material-icons modal__search__sidebar__icon--clear">replay</i>
62
+ </div>
63
+ </div>
64
+ <div className="modal__search__sidebar__entity-list">
65
+ <h1>Entity list</h1>
66
+ {entitiesToShow.map(entity => (
67
+ <Checkbox
68
+ checked={entityValues.some(_entity => _entity.id === entity.id)}
69
+ label={entity.displayName}
70
+ id={entity.id}
71
+ name={entity.id}
72
+ onChange={({ value: { checked } }) => handleSetEntityValues(entity)}
73
+ />
74
+ ))}
75
+ <div
76
+ className="modal__search__sidebar__more"
77
+ role="button"
78
+ onClick={() => setLoadMore(!loadMore)}>
79
+ <i className="material-icons">{!loadMore ? 'navigate_next' : 'expand_less'}</i>
80
+ <span>{loadMore ? 'Less' : 'More'}</span>
81
+ </div>
82
+ </div>
83
+ </div>
84
+ </div>
85
+ );
86
+ };
87
+
88
+ export default SearchAdminSideBar;
@@ -0,0 +1,3 @@
1
+ import SearchAdminSideBar from './SearchAdminSideBar';
2
+
3
+ export default SearchAdminSideBar;