@@ -513,7 +541,7 @@ const CustomBucketAggregationValuesElement = (props) => {
const customEmpytResultsElement = (props) => {
const { resetQuery } = props;
return (
-
+
@@ -565,8 +593,8 @@ const customSort = ({
};
const customPaginationElement = (props) => {
- const { currentPage, currentSize, totalResults, onPageChange, options} =
- props;
+ const { currentPage, currentSize, totalResults, onPageChange, options } =
+ props;
const pages = Math.ceil(totalResults / currentSize);
const boundaryRangeCount = options.boundaryRangeCount;
const siblingRangeCount = options.siblingRangeCount;
@@ -650,35 +678,6 @@ const sortValues = [
// },
];
-const initialState = {
- sortBy: 'bestmatch',
- sortOrder: 'asc',
- // sortBy: 'modified',
- // sortOrder: 'desc',
- queryString: '',
- layout: 'list',
- page: 1,
- size: 10,
-};
-
-const defaultOverriddenComponents = {
- 'ResultsList.item.elasticsearch': CustomResultsListItem,
- 'Count.element': MyCountElement,
- 'ActiveFilters.element': myActiveFiltersElement,
- 'EmptyResults.element': customEmpytResultsElement,
- 'Sort.element.volto': customSort,
- 'Pagination.element': customPaginationElement,
- 'Error.element': ErrorComponent,
-};
-
-const dropdownOverriddenComponents = {
- 'BucketAggregation.element': CustomBucketAggregationElement,
- 'BucketAggregationContainer.element': CustomBucketAggregationContainerElement,
- 'BucketAggregationValues.element': withState(
- CustomBucketAggregationValuesElement,
- ),
-};
-
/**
* FacetedSearch
* @param {string} filterLayout default 'dropdown'
@@ -703,6 +702,39 @@ const FacetedSearch = ({ data, overriddenComponents }) => {
delete facet_fields_object.Subject;
}
+ // TODO Get config from blocks data
+ const initialState = {
+ page: 1,
+ queryString: '',
+ sortBy: 'modified',
+ sortOrder: 'desc',
+ size: data.batchSize,
+ layout: 'list',
+ };
+
+ const defaultOverriddenComponents = {
+ 'ResultsList.item.elasticsearch': withState(
+ config.getComponent('CustomResultsListItem').component ||
+ _CustomResultsListItem,
+ ),
+ 'Count.element': MyCountElement,
+ 'ActiveFilters.element': myActiveFiltersElement,
+ 'EmptyResults.element': customEmpytResultsElement,
+ 'Sort.element.volto': customSort,
+ 'Pagination.element': customPaginationElement,
+ 'Error.element': ErrorComponent,
+ 'ResultsLoader.element': MyResultsLoaderElement,
+ };
+
+ const dropdownOverriddenComponents = {
+ 'BucketAggregation.element': CustomBucketAggregationElement,
+ 'BucketAggregationContainer.element':
+ CustomBucketAggregationContainerElement,
+ 'BucketAggregationValues.element': withState(
+ CustomBucketAggregationValuesElement,
+ ),
+ };
+
overriddenComponents = {
...defaultOverriddenComponents,
...(filterLayout === 'dropdown' && dropdownOverriddenComponents),
@@ -710,34 +742,41 @@ const FacetedSearch = ({ data, overriddenComponents }) => {
config.settings.searchkitblock.overriddenComponents),
};
- // TODO Check if check on client could be made simpler
- const [isClient, setIsClient] = React.useState(null);
- React.useEffect(() => setIsClient(true), []);
+ // Language. Search is done with language by targeting the appropriate fields:
+ // for example title.de, title.en
+ const state_intl_locale = useSelector((state) => state.intl?.locale) || 'en';
+ let locale = config?.settings?.isMultilingual
+ ? state_intl_locale
+ : config?.settings?.defaultLanguage || 'en';
+
+ const [isClient, setIsClient] = React.useState(false);
+ React.useEffect(() => {
+ setIsClient(true);
+ }, []);
return (
{isClient && (
{typeof document !== 'undefined' && relocation?.length > 0 ? (
- ,
+ true &&
document.querySelectorAll(relocation) &&
- document.querySelectorAll(relocation)[0]
- }
- >
-
-
+ document.querySelectorAll(relocation)[0],
+ )
) : (
diff --git a/packages/volto-searchkit-block/src/components/Views/ListingVariationTemplateWithBookmarks.jsx b/packages/volto-searchkit-block/src/components/Views/ListingVariationTemplateWithBookmarks.jsx
new file mode 100644
index 00000000..7599b38e
--- /dev/null
+++ b/packages/volto-searchkit-block/src/components/Views/ListingVariationTemplateWithBookmarks.jsx
@@ -0,0 +1,55 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import ConditionalLink from '@plone/volto/components/manage/ConditionalLink/ConditionalLink';
+import Component from '@plone/volto/components/theme/Component/Component';
+import { flattenToAppURL } from '@plone/volto/helpers/Url/Url';
+
+import { isInternalURL } from '@plone/volto/helpers/Url/Url';
+
+import { ToggleBookmarkButton } from '@plone-collective/volto-bookmarks/components';
+
+const SummaryTemplate = ({ items, linkTitle, linkHref, isEditMode }) => {
+ let link = null;
+ let href = linkHref?.[0]?.['@id'] || '';
+
+ if (isInternalURL(href)) {
+ link = (
+
+ {linkTitle || href}
+
+ );
+ } else if (href) {
+ link = {linkTitle || href};
+ }
+
+ return (
+ <>
+
+ {items.map((item) => (
+
+
+
+
+
+
+
+
{item.title || item.id}
+
{item.description}
+
+
+ ))}
+
{link}
}
+
+ );
+};
+
+SummaryTemplate.propTypes = {
+ items: PropTypes.arrayOf(PropTypes.any).isRequired,
+ linkMore: PropTypes.any,
+ isEditMode: PropTypes.bool,
+};
+
+export default SummaryTemplate;
diff --git a/packages/volto-searchkit-block/src/components/Views/TestSearchkitQuerystrings.jsx b/packages/volto-searchkit-block/src/components/Views/TestSearchkitQuerystrings.jsx
new file mode 100644
index 00000000..a772f2ed
--- /dev/null
+++ b/packages/volto-searchkit-block/src/components/Views/TestSearchkitQuerystrings.jsx
@@ -0,0 +1,225 @@
+import React from 'react';
+import { useIntl } from 'react-intl';
+import { createPortal } from 'react-dom';
+import { Container, Header, Segment } from 'semantic-ui-react';
+import { useHistory } from 'react-router';
+import { Link, useLocation } from 'react-router-dom';
+import { useSelector } from 'react-redux';
+import { OverridableContext } from 'react-overridable';
+import { Icon, Toolbar } from '@plone/volto/components';
+import { getParentUrl } from '@plone/volto/helpers';
+import backSVG from '@plone/volto/icons/back.svg';
+
+import {
+ onQueryChanged,
+ ReactSearchKit,
+ SearchBar,
+ withState,
+ ResultsMultiLayout,
+ Count,
+} from 'react-searchkit';
+import { flattenESUrlToPath } from '../helpers';
+import { ploneSearchApi } from './FacetedSearch';
+import { ElasticSearchMatches } from '../Searchkit/ElasticSearchHighlights';
+import messages from '../../messages';
+
+import config from '@plone/volto/registry';
+
+const sort_caseinsensitive = (a, b) => {
+ var nameA = a.toUpperCase(); // Groß-/Kleinschreibung ignorieren
+ var nameB = b.toUpperCase(); // Groß-/Kleinschreibung ignorieren
+ if (nameA < nameB) {
+ return -1;
+ }
+ if (nameA > nameB) {
+ return 1;
+ }
+ return 0;
+};
+
+const _OnHighlights = (props) => {
+ let location = useLocation();
+ let highlights = props.currentResultsState;
+ let hits = highlights.data.hits;
+
+ const regex = /(.*?)<\/em>/gm;
+ let fragments = [];
+ hits.map((hit) => {
+ hit.highlight = hit.highlight || [];
+ Object.keys(hit.highlight).forEach((fld) => {
+ hit.highlight[fld].forEach((highlightfragment) => {
+ fragments.push(highlightfragment);
+ });
+ });
+ return null;
+ });
+ let matches = new Set();
+ fragments.forEach((txt) => {
+ let result = [...txt.matchAll(regex)];
+ result.forEach((match) => {
+ matches.add(match[1]);
+ });
+ });
+ let matches_sorted = Array.from(matches);
+ matches_sorted.sort(sort_caseinsensitive);
+ return (
+
+ {matches_sorted.length > 0 && (
+
{matches_sorted.length} matches found:
+ )}
+ {matches_sorted.map((match) => (
+
+ ))}
+
-
Found {matches_sorted.length} matches.
- {matches_sorted.map((match) => (
-
- ))}
-
-
-
-
- );
-};
-
-const DocumentsCount = ({ totalResults }) => {
- return Found {totalResults} documents.;
-};
-
-const overriddenComponents = {
- 'ResultsList.item': CustomResultsListItem,
- 'Count.element': DocumentsCount,
-};
-
-const TestSearchkitQuerystrings = (props) => {
- const intl = useIntl();
- const dispatch = useDispatch();
- const searchkitblock_controlpanel = useSelector(
- (state) => state.controlpanels.controlpanel?.data,
- );
- const searchconfig = searchkitblock_controlpanel
- ? {
- elastic_search_api_url:
- searchkitblock_controlpanel?.testsearch_elasticsearch_url,
- elastic_search_api_index:
- searchkitblock_controlpanel?.testsearch_elasticsearch_index,
-
- searchedFields: [],
- facet_fields: [],
- allowed_content_types:
- searchkitblock_controlpanel?.allowed_content_types,
- allowed_review_states:
- searchkitblock_controlpanel?.allowed_review_states,
- backend_url: searchkitblock_controlpanel?.testsearch_backend,
- frontend_url: searchkitblock_controlpanel?.testsearch_frontend,
- }
- : {};
-
- const initialState = {
- sortBy: 'bestmatch',
- sortOrder: 'asc',
- // sortBy: 'modified',
- // sortOrder: 'desc',
- queryString: '',
- layout: 'list',
- page: 1,
- size: 50,
- };
-
- const onchangehandler = (event, data) => {
- let searchQuery = {
- ...initialState,
- queryString: data.value,
- };
- onQueryChanged({ searchQuery: searchQuery });
- return;
- };
-
- const [isClient, setIsClient] = React.useState(null);
- React.useEffect(() => setIsClient(true), []);
-
- React.useEffect(() => {
- dispatch(getControlpanel('volto_searchkit_block_control_panel'));
- }, [dispatch]);
-
- return (
-
-
-
-
- {isClient && searchkitblock_controlpanel && (
-
-
- <>
-
- {/* {
- onchangehandler(event, data);
- }}
- /> */}
- {
- onchangehandler(event, data);
- }}
- />
-
-
-
-
- Documents with title and matches
-
-
-
-
-
- )}
-
-
-
-
- );
-};
-
-export default TestSearchkitQuerystrings;
diff --git a/variables.mk b/variables.mk
deleted file mode 100644
index b71ccaa5..00000000
--- a/variables.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-PLONE_VERSION=6.0
-VOLTO_VERSION=17.15.2
-
-ADDON_NAME='@rohberg/volto-searchkit-block'
-ADDON_PATH='volto-searchkit-block'
-KGS=plone.restapi==9.4.2 plone.volto==4.3.0 plone.rest==4.1.3
-TESTING_ADDONS=plone.app.robotframework==2.1.2 plone.app.testing==7.0.2
\ No newline at end of file
diff --git a/volto.config.js b/volto.config.js
new file mode 100644
index 00000000..b493706e
--- /dev/null
+++ b/volto.config.js
@@ -0,0 +1,7 @@
+const addons = ['@rohberg/volto-searchkit-block'];
+const theme = '';
+
+module.exports = {
+ addons,
+ theme,
+};
diff --git a/webpack.config.js b/webpack.config.js
deleted file mode 100644
index 655b2948..00000000
--- a/webpack.config.js
+++ /dev/null
@@ -1,9 +0,0 @@
-const path = require('path');
-
-module.exports = {
- entry: './src/index.js',
- output: {
- filename: 'main.js',
- path: path.resolve(__dirname, 'dist'),
- },
-};