@eeacms/volto-clms-theme 1.1.288 → 1.1.290

package/src/customizations/@eeacms/volto-embed/PrivacyProtection/PrivacyProtection.jsx

@@ -1,42 +1,17 @@
 import React, { useState } from 'react';
 import { compose } from 'redux';
-import { useSelector, useDispatch } from 'react-redux';
 import VisibilitySensor from 'react-visibility-sensor';
-import {
-  Placeholder,
-  Dimmer,
-  Loader,
-  Button,
-  Checkbox,
-} from 'semantic-ui-react';
+import { Placeholder, Button, Checkbox } from 'semantic-ui-react';
 import { withCookies } from 'react-cookie';
 import { serializeNodes } from '@plone/volto-slate/editor/render';
-import { defineMessages, injectIntl } from 'react-intl';
-import { toast } from 'react-toastify';
+import { injectIntl } from 'react-intl';
 import config from '@plone/volto/registry';
-import { getBaseUrl } from '@plone/volto/helpers';
-import { Toast } from '@plone/volto/components';
-import {
-  getConnectedDataParametersForContext,
-  getFilteredURL,
-} from '@eeacms/volto-datablocks/helpers';
 
 import { createImageUrl } from '@eeacms/volto-embed/PrivacyProtection/helpers';
 import { ProtectionSchema } from '@eeacms/volto-embed/PrivacyProtection/schema';
 
 import '@eeacms/volto-embed/PrivacyProtection/styles.less';
 
-const messages = defineMessages({
-  success: {
-    id: 'Success',
-    defaultMessage: 'Success',
-  },
-  image: {
-    id: 'Live image generated',
-    defaultMessage: 'Live image generated',
-  },
-});
-
 const key = (domain_key) => `accept-${domain_key}`;
 
 const getExpDays = () =>
@@ -76,16 +51,7 @@ const CookieWatcher = (domain_key, cookies, pollingRate = 250) => {
 };
 
 const PrivacyProtection = (props) => {
-  const {
-    children,
-    data = {},
-    id,
-    editable,
-    intl,
-    path,
-    cookies,
-    height = '',
-  } = props;
+  const { children, data = {}, id, editable, cookies, height = '' } = props;
   const {
     enabled = false,
     privacy_statement,
@@ -100,15 +66,7 @@ const PrivacyProtection = (props) => {
   const [remember, setRemember] = useState(
     cookieExist(privacy_cookie_key, cookies) ? defaultShow : true,
   );
-  const dispatch = useDispatch();
   const checkExistance = CookieWatcher(privacy_cookie_key, cookies);
-  const connected_data_parameters = useSelector((state) => {
-    return getConnectedDataParametersForContext(
-      state?.connected_data_parameters,
-      state.router?.location?.pathname,
-    );
-  });
-  const url = getFilteredURL(data.url, connected_data_parameters);
 
   React.useEffect(() => {
     if (bgImg) {
@@ -127,37 +85,6 @@ const PrivacyProtection = (props) => {
     [checkExistance],
   );
 
-  //screenshot api
-  React.useEffect(() => {
-    if (enabled && !bgImg && !show && url) {
-      fetch(
-        `${getBaseUrl(
-          '',
-        )}/cors-proxy/https://screenshot.eea.europa.eu/api/v1/retrieve_image_for_url?url=${encodeURIComponent(
-          url,
-        )}&w=1920&waitfor=4000`,
-      )
-        .then((e) => e.blob())
-        .then((blob) => {
-          setImage(URL.createObjectURL(blob));
-          if (editable) {
-            toast.success(
-              <Toast
-                success
-                title={intl.formatMessage(messages.success)}
-                content={intl.formatMessage(messages.image)}
-              />,
-            );
-          }
-        })
-        .catch(() => {
-          if (__DEVELOPMENT__) {
-            /* eslint-disable-next-line */
-            console.log('Please enable your VPN!');
-          }
-        });
-    }
-  }, [enabled, url, path, dispatch, bgImg, show, intl, editable]);
   return (
     <VisibilitySensor
       onChange={(isVisible) => {
@@ -178,10 +105,6 @@ const PrivacyProtection = (props) => {
         >
           {!enabled || show ? (
             children
-          ) : !__DEVELOPMENT__ && !image ? (
-            <Dimmer active>
-              <Loader />
-            </Dimmer>
           ) : (
             <div
               className="privacy-protection"

package/src/customizations/volto/components/manage/Blocks/Search/SearchBlockView.jsx

@@ -1,9 +1,10 @@
 import React from 'react';
 
 import ListingBody from '@plone/volto/components/manage/Blocks/Listing/ListingBody';
-import { withBlockExtensions } from '@plone/volto/helpers';
+import { BodyClass, withBlockExtensions } from '@plone/volto/helpers';
 
 import config from '@plone/volto/registry';
+import { usesGlobalSearchDesign } from '@eeacms/volto-clms-theme/components/Blocks/CustomTemplates/VoltoSearchBlock/searchDesign';
 
 import {
   withSearch,
@@ -63,7 +64,12 @@ const applyDefaults = (data, root) => {
 };
 
 const SearchBlockView = (props) => {
-  const { data, searchData, mode = 'view', variation } = props;
+  const { data, searchData, mode = 'view', variation, location, path } = props;
+  const hasGlobalSearchDesign = usesGlobalSearchDesign({
+    data,
+    location,
+    path,
+  });
 
   const Layout = variation.view;
 
@@ -86,8 +92,17 @@ const SearchBlockView = (props) => {
   const { variations } = config.blocks.blocksConfig.listing;
   const listingBodyVariation = variations.find(({ id }) => id === selectedView);
 
-  return (
-    <div className="block search">
+  const searchBlock = (
+    <div
+      className={[
+        'block search',
+        hasGlobalSearchDesign
+          ? 'global-search-block searchlib-block searchapp searchapp-clmsSearchTechnicalLibrary'
+          : '',
+      ]
+        .filter(Boolean)
+        .join(' ')}
+    >
       <Layout
         {...props}
         isEditMode={mode === 'edit'}
@@ -103,6 +118,14 @@ const SearchBlockView = (props) => {
       </Layout>
     </div>
   );
+
+  return hasGlobalSearchDesign ? (
+    <BodyClass className="global-search-page searchlib-page">
+      {searchBlock}
+    </BodyClass>
+  ) : (
+    searchBlock
+  );
 };
 
 export const SearchBlockViewComponent = compose(

package/src/customizations/volto/components/manage/Blocks/Search/hocs/withSearch.jsx

@@ -35,6 +35,7 @@ function getInitialState(
   id,
   sortOnParam,
   sortOrderParam,
+  useDefaultSort = true,
 ) {
   const {
     types: facetWidgetTypes,
@@ -69,8 +70,18 @@ function getInitialState(
           ]
         : []),
     ],
-    sort_on: sortOnParam || data.query?.sort_on,
-    sort_order: sortOrderParam || data.query?.sort_order,
+    sort_on:
+      sortOnParam !== undefined
+        ? sortOnParam
+        : useDefaultSort
+        ? data.query?.sort_on
+        : undefined,
+    sort_order:
+      sortOrderParam !== undefined
+        ? sortOrderParam
+        : useDefaultSort
+        ? data.query?.sort_order
+        : undefined,
     b_size: data.query?.b_size,
     limit: data.query?.limit,
     block: id,
@@ -92,6 +103,7 @@ function normalizeState({
   sortOn,
   sortOrder,
   facetSettings, // data.facets extracted from block data
+  useDefaultSort = true,
 }) {
   const {
     types: facetWidgetTypes,
@@ -115,8 +127,18 @@ function normalizeState({
         return valueToQuery({ value, facet });
       }),
     ].filter((o) => !!o),
-    sort_on: sortOn || query.sort_on,
-    sort_order: sortOrder || query.sort_order,
+    sort_on:
+      sortOn !== undefined
+        ? sortOn
+        : useDefaultSort
+        ? query.sort_on
+        : undefined,
+    sort_order:
+      sortOrder !== undefined
+        ? sortOrder
+        : useDefaultSort
+        ? query.sort_order
+        : undefined,
     b_size: query.b_size,
     limit: query.limit,
     block: id,
@@ -196,6 +218,13 @@ const useHashState = () => {
           }
         });
 
+      SEARCH_ENDPOINT_FIELDS.forEach((k) => {
+        if (!searchData[k] && oldState[k]) {
+          delete newParams[k];
+          changed = true;
+        }
+      });
+
       if (changed) {
         history.push({
           search: qs.stringify(newParams),
@@ -240,6 +269,7 @@ const withSearch = (options) => (WrappedComponent) => {
 
   function WithSearch(props) {
     const { data, id, editable = false } = props;
+    const isGlobalSearch = data?.listingBodyTemplate === 'CclGlobalSearch';
 
     const [locationSearchData, setLocationSearchData] = useSearchBlockState(
       id,
@@ -323,11 +353,25 @@ const withSearch = (options) => (WrappedComponent) => {
       previousUrlQuery,
     ]);
 
-    const [sortOn, setSortOn] = React.useState(data?.query?.sort_on);
-    const [sortOrder, setSortOrder] = React.useState(data?.query?.sort_order);
+    const [sortOn, setSortOn] = React.useState(
+      locationSearchData.sort_on ||
+        (isGlobalSearch ? undefined : data?.query?.sort_on),
+    );
+    const [sortOrder, setSortOrder] = React.useState(
+      locationSearchData.sort_order ||
+        (isGlobalSearch ? undefined : data?.query?.sort_order),
+    );
 
     const [searchData, setSearchData] = React.useState(
-      getInitialState(data, facets, urlSearchText, id),
+      getInitialState(
+        data,
+        facets,
+        urlSearchText,
+        id,
+        sortOn,
+        sortOrder,
+        !isGlobalSearch,
+      ),
     );
 
     const deepFacets = JSON.stringify(facets);
@@ -341,9 +385,18 @@ const withSearch = (options) => (WrappedComponent) => {
           id,
           sortOn,
           sortOrder,
+          !isGlobalSearch,
         ),
       );
-    }, [deepData, deepFacets, urlSearchText, id, sortOn, sortOrder]);
+    }, [
+      deepData,
+      deepFacets,
+      urlSearchText,
+      id,
+      sortOn,
+      sortOrder,
+      isGlobalSearch,
+    ]);
 
     const timeoutRef = React.useRef();
     const facetSettings = data?.facets;
@@ -359,18 +412,32 @@ const withSearch = (options) => (WrappedComponent) => {
         if (timeoutRef.current) clearTimeout(timeoutRef.current);
         timeoutRef.current = setTimeout(
           () => {
+            const shouldClearSort = toSortOn === null;
+            const hasSortOnParam = toSortOn !== undefined;
+            const nextSortOn = shouldClearSort
+              ? undefined
+              : hasSortOnParam
+              ? toSortOn
+              : sortOn;
+            const nextSortOrder = shouldClearSort
+              ? undefined
+              : toSortOrder !== undefined
+              ? toSortOrder
+              : sortOrder;
             const newSearchData = normalizeState({
               id,
               query: data.query || {},
               facets: toSearchFacets || facets,
               searchText: toSearchText ? toSearchText.trim() : '',
-              sortOn: toSortOn || sortOn,
-              sortOrder: toSortOrder || sortOrder,
+              sortOn: nextSortOn,
+              sortOrder: nextSortOrder,
               facetSettings,
+              useDefaultSort: !isGlobalSearch,
             });
             if (toSearchFacets) setFacets(toSearchFacets);
-            if (toSortOn) setSortOn(toSortOn);
-            if (toSortOrder) setSortOrder(toSortOrder);
+            if (hasSortOnParam) setSortOn(toSortOn || undefined);
+            if (toSortOrder !== undefined)
+              setSortOrder(toSortOrder || undefined);
             setSearchData(newSearchData);
             setLocationSearchData(getSearchFields(newSearchData));
           },
@@ -388,6 +455,7 @@ const withSearch = (options) => (WrappedComponent) => {
         sortOn,
         sortOrder,
         facetSettings,
+        isGlobalSearch,
       ],
     );