@eeacms/volto-clms-theme 1.1.289 → 1.1.290

package/CHANGELOG.md

@@ -4,6 +4,16 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+### [1.1.290](https://github.com/eea/volto-clms-theme/compare/1.1.289...1.1.290) - 21 May 2026
+
+#### :rocket: New Features
+
+- feat: unify the design of technical library search with global search and dataset catalogue -refs #291483 [ana-oprea - [`8e1c755`](https://github.com/eea/volto-clms-theme/commit/8e1c7555b35fbeb49c3d78a8b47ad65b51b98e33)]
+
+#### :hammer_and_wrench: Others
+
+- fix icon and jest [ana-oprea - [`2566588`](https://github.com/eea/volto-clms-theme/commit/256658849faedcbfb406edd2d4bad2d1c4a287b7)]
+- fix jest [ana-oprea - [`1c1d529`](https://github.com/eea/volto-clms-theme/commit/1c1d529940cb43bc02afe77686578cc181473a55)]
 ### [1.1.289](https://github.com/eea/volto-clms-theme/compare/1.1.288...1.1.289) - 21 May 2026
 
 #### :hammer_and_wrench: Others

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-clms-theme",
-  "version": "1.1.289",
+  "version": "1.1.290",
   "description": "volto-clms-theme: Volto theme for CLMS site",
   "main": "src/index.js",
   "author": "CodeSyntax for the European Environment Agency",

package/src/components/Blocks/CustomTemplates/VoltoSearchBlock/FilterList.jsx

@@ -12,6 +12,10 @@ const messages = defineMessages({
     id: 'Clear filters',
     defaultMessage: 'Clear filters',
   },
+  applied: {
+    id: 'Applied',
+    defaultMessage: 'Applied',
+  },
 });
 
 const FilterList = (props) => {
@@ -93,7 +97,34 @@ const FilterList = (props) => {
     .length;
 
   const intl = useIntl();
-  return showFilterList && Object.keys(currentFilters).length ? (
+  if (!showFilterList || !Object.keys(currentFilters).length) return null;
+
+  if (props.variant === 'globalSearch') {
+    if (!totalFilters) return null;
+
+    return (
+      <div className="global-search-applied-filters">
+        <span>
+          {intl.formatMessage(messages.applied)}: {totalFilters}
+        </span>
+        <Button
+          icon
+          basic
+          compact
+          size="small"
+          aria-label={intl.formatMessage(messages.clearFilters)}
+          onClick={(e) => {
+            e.stopPropagation();
+            !isEditMode && setFacets({});
+          }}
+        >
+          <Icon name="trash" />
+        </Button>
+      </div>
+    );
+  }
+
+  return (
     <div className="accordion ui filter-listing">
       <div
         className="filter-list-header"
@@ -118,7 +149,7 @@ const FilterList = (props) => {
         </Button>
       </div>
     </div>
-  ) : null;
+  );
 };
 
 export default FilterList;

package/src/components/Blocks/CustomTemplates/VoltoSearchBlock/RightModalFacets.jsx

@@ -12,6 +12,7 @@ import { Icon } from '@plone/volto/components';
 import React from 'react';
 import filterSVG from '@plone/volto/icons/filter.svg';
 import { flushSync } from 'react-dom';
+import { usesGlobalSearchDesign } from './searchDesign';
 
 const messages = defineMessages({
   searchButtonText: {
@@ -26,6 +27,76 @@ const FacetWrapper = ({ children }) => (
   </Segment>
 );
 
+const getSortLabel = (value, querystring) => {
+  const title = querystring?.sortable_indexes?.[value]?.title || value;
+  if (
+    ['effective', 'publication_date', 'modified'].includes(value) ||
+    /publication date/i.test(title)
+  ) {
+    return 'Time';
+  }
+  if (value === 'sortable_title') {
+    return 'Title';
+  }
+  if (value === 'relevance') {
+    return 'Relevance';
+  }
+  return title?.replace(/^Sort by /, '') || value;
+};
+
+const GlobalSortOn = ({
+  data,
+  querystring,
+  isEditMode,
+  sortOn,
+  sortOrder,
+  onChange,
+}) => {
+  const configuredOptions = data.sortOnOptions || [];
+  const concreteOptions = configuredOptions.filter(
+    (option) => !['SearchableText', 'relevance'].includes(option),
+  );
+  const options = ['relevance', ...concreteOptions];
+  const activeSortOn = sortOn && options.includes(sortOn) ? sortOn : options[0];
+
+  if (!options.length) return null;
+
+  return (
+    <div className="sorting global-search-sorting">
+      <span className="global-search-sort-label">Sort by:</span>
+      {options.map((option) => {
+        const isActive = activeSortOn === option;
+        return (
+          <button
+            key={option}
+            type="button"
+            className={isActive ? 'active' : ''}
+            onClick={() => {
+              if (isEditMode) return;
+              if (option === 'relevance') {
+                onChange(null, null);
+                return;
+              }
+              const nextOrder =
+                isActive && sortOrder === 'ascending'
+                  ? 'descending'
+                  : 'ascending';
+              onChange(option, nextOrder);
+            }}
+          >
+            {getSortLabel(option, querystring)}
+            {isActive && option !== 'relevance' && (
+              <span className="global-search-sort-direction">
+                {sortOrder === 'descending' ? '▼' : '▲'}
+              </span>
+            )}
+          </button>
+        );
+      })}
+    </div>
+  );
+};
+
 function setFacetsHandler(setFacets, onTriggerSearch, searchedText) {
   return (f) => {
     flushSync(() => {
@@ -57,6 +128,7 @@ const RightModalFacets = (props) => {
   } = props;
   const { showSearchButton } = data;
   const isLive = !showSearchButton;
+  const hasGlobalSearchDesign = usesGlobalSearchDesign(props);
   const intl = useIntl();
   // Should we generalize this to an external function?
   if (querystring?.sortable_indexes?.effective?.title) {
@@ -75,8 +147,64 @@ const RightModalFacets = (props) => {
     querystring.sortable_indexes.version.title = 'Version';
   }
 
+  const updateFacets = setFacetsHandler(
+    setFacets,
+    onTriggerSearch,
+    searchedText,
+  );
+
+  const facetsModal = data.facets?.length ? (
+    <CclFiltersModal
+      trigger={
+        <div className="filters-element">
+          <div className="filters-title">
+            {hasGlobalSearchDesign ? (
+              <span
+                className="global-search-categories-icon"
+                aria-hidden="true"
+              >
+                <Icon
+                  className="global-search-categories-filter-icon"
+                  name={filterSVG}
+                  size="10px"
+                  color="#fff"
+                />
+              </span>
+            ) : (
+              <Icon className="ui" name={filterSVG} size={'20'} />
+            )}
+            <span className="filters-title-bold">
+              {hasGlobalSearchDesign ? 'Show Categories' : data.facetsTitle}
+            </span>
+          </div>
+        </div>
+      }
+      data={data}
+      setFacets={updateFacets}
+    >
+      <div id="right-modal-facets" className="facets">
+        <Facets
+          querystring={querystring}
+          data={data}
+          facets={facets}
+          isEditMode={isEditMode}
+          setFacets={updateFacets}
+          facetWrapper={FacetWrapper}
+        />
+      </div>
+    </CclFiltersModal>
+  ) : null;
+
   return (
-    <Grid className="searchBlock-facets right-column-facets" stackable>
+    <Grid
+      className={[
+        'searchBlock-facets right-column-facets',
+        hasGlobalSearchDesign ? 'global-search-facets' : '',
+      ]
+        .filter(Boolean)
+        .join(' ')}
+      stackable
+    >
       {data?.headline && (
         <Grid.Row>
           <Grid.Column>
@@ -91,21 +219,29 @@ const RightModalFacets = (props) => {
             ? data.showSearchInput
             : true) && (
             <>
-              <div className="search-wrapper">
-                <SearchInput {...props} isLive={isLive} />
-                {data.showSearchButton && (
-                  <Button
-                    primary
-                    onClick={() => onTriggerSearch(searchText)}
-                    aria-label={
-                      data.searchButtonLabel ||
-                      intl.formatMessage(messages.searchButtonText)
-                    }
-                  >
-                    <span className="ccl-icon-zoom"></span>
-                  </Button>
-                )}
-              </div>
+              {hasGlobalSearchDesign ? (
+                <SearchInput
+                  {...props}
+                  isLive={isLive}
+                  useSearchlibSearchDesign={hasGlobalSearchDesign}
+                />
+              ) : (
+                <div className="search-wrapper">
+                  <SearchInput {...props} isLive={isLive} />
+                  {data.showSearchButton && (
+                    <Button
+                      primary
+                      onClick={() => onTriggerSearch(searchText)}
+                      aria-label={
+                        data.searchButtonLabel ||
+                        intl.formatMessage(messages.searchButtonText)
+                      }
+                    >
+                      <span className="ccl-icon-zoom"></span>
+                    </Button>
+                  )}
+                </div>
+              )}
               <div className="search-box-hint">
                 <p>
                   Hint: you can use double quotes to search for exact phrases.
@@ -115,84 +251,92 @@ const RightModalFacets = (props) => {
             </>
           )}
 
-          <div>
-            <FilterList
-              {...props}
-              isEditMode={isEditMode}
-              setFacets={setFacetsHandler(
-                setFacets,
-                onTriggerSearch,
-                searchedText,
-              )}
-            />
-          </div>
-
-          <div className="search-results-count-sort search-filters">
-            <SearchDetails total={totalItems} data={data} />
-            <div className="filters-container">
-              {data.showSortOn && (
-                <SortOn
-                  data={data}
-                  querystring={querystring}
+          {hasGlobalSearchDesign ? (
+            <>
+              <div className="global-search-count">
+                <SearchDetails total={totalItems} data={data} as="div" />
+              </div>
+              <div className="above-results global-search-above-results">
+                <div className="global-search-filters-left">
+                  {facetsModal}
+                  <FilterList
+                    {...props}
+                    variant="globalSearch"
+                    isEditMode={isEditMode}
+                    setFacets={updateFacets}
+                  />
+                </div>
+                {data.showSortOn && (
+                  <GlobalSortOn
+                    data={data}
+                    querystring={querystring}
+                    isEditMode={isEditMode}
+                    sortOrder={sortOrder}
+                    sortOn={sortOn}
+                    onChange={(sortOnParam, sortOrderParam) => {
+                      flushSync(() => {
+                        setSortOn(sortOnParam || undefined);
+                        setSortOrder(sortOrderParam || undefined);
+                        onTriggerSearch(
+                          searchedText || '',
+                          facets,
+                          sortOnParam,
+                          sortOrderParam,
+                        );
+                      });
+                    }}
+                  />
+                )}
+              </div>
+            </>
+          ) : (
+            <>
+              <div>
+                <FilterList
+                  {...props}
                   isEditMode={isEditMode}
-                  sortOrder={sortOrder}
-                  sortOn={sortOn}
-                  setSortOn={(sortOnParam) => {
-                    flushSync(() => {
-                      setSortOn(sortOnParam);
-                      onTriggerSearch(searchedText || '', facets, sortOnParam);
-                    });
-                  }}
-                  setSortOrder={(sortOrderParam) => {
-                    flushSync(() => {
-                      setSortOrder(sortOrderParam);
-                      onTriggerSearch(
-                        searchedText || '',
-                        facets,
-                        sortOn,
-                        sortOrderParam,
-                      );
-                    });
-                  }}
+                  setFacets={updateFacets}
                 />
-              )}
-              {data.facets?.length && (
-                <CclFiltersModal
-                  trigger={
-                    <div className="filters-element">
-                      <div className="filters-title">
-                        <Icon className="ui" name={filterSVG} size={'20'} />
-                        <span className="filters-title-bold">
-                          {data.facetsTitle}
-                        </span>
-                      </div>
-                    </div>
-                  }
-                  data={data}
-                  setFacets={setFacetsHandler(
-                    setFacets,
-                    onTriggerSearch,
-                    searchedText,
-                  )}
-                >
-                  <div id="right-modal-facets" className="facets">
-                    <Facets
-                      querystring={querystring}
+              </div>
+
+              <div className="search-results-count-sort search-filters">
+                <SearchDetails total={totalItems} data={data} />
+                <div className="filters-container">
+                  {data.showSortOn && (
+                    <SortOn
                       data={data}
-                      facets={facets}
+                      querystring={querystring}
                       isEditMode={isEditMode}
-                      setFacets={setFacetsHandler(
-                        setFacets,
-                        onTriggerSearch,
-                        searchedText,
-                      )}
-                      facetWrapper={FacetWrapper}
+                      sortOrder={sortOrder}
+                      sortOn={sortOn}
+                      setSortOn={(sortOnParam) => {
+                        flushSync(() => {
+                          setSortOn(sortOnParam);
+                          onTriggerSearch(
+                            searchedText || '',
+                            facets,
+                            sortOnParam,
+                          );
+                        });
+                      }}
+                      setSortOrder={(sortOrderParam) => {
+                        flushSync(() => {
+                          setSortOrder(sortOrderParam);
+                          onTriggerSearch(
+                            searchedText || '',
+                            facets,
+                            sortOn,
+                            sortOrderParam,
+                          );
+                        });
+                      }}
                     />
-                  </div>
-                </CclFiltersModal>
-              )}
-            </div>
-          </div>
+                  )}
+                  {facetsModal}
+                </div>
+              </div>
+            </>
+          )}
           {children}
         </Grid.Column>
       </Grid.Row>

package/src/components/Blocks/CustomTemplates/VoltoSearchBlock/SearchInput.jsx

@@ -1,8 +1,9 @@
 import React from 'react';
-import { Button, Input } from 'semantic-ui-react';
+import { Button, Icon as SemanticIcon, Input } from 'semantic-ui-react';
 import { defineMessages, useIntl } from 'react-intl';
-import { Icon } from '@plone/volto/components';
+import { Icon as VoltoIcon } from '@plone/volto/components';
 import clearSVG from '@plone/volto/icons/clear.svg';
+import searchSVG from './icons/search.svg';
 
 const messages = defineMessages({
   search: {
@@ -12,8 +13,86 @@ const messages = defineMessages({
 });
 
 const SearchInput = (props) => {
-  const { data, searchText, setSearchText, isLive, onTriggerSearch } = props;
+  const {
+    data,
+    searchText,
+    setSearchText,
+    isLive,
+    isGlobalSearch,
+    useSearchlibSearchDesign = isGlobalSearch,
+    onTriggerSearch,
+  } = props;
   const intl = useIntl();
+  const placeholder =
+    data.searchInputPrompt || intl.formatMessage(messages.search);
+
+  if (useSearchlibSearchDesign) {
+    return (
+      <div className="sui-search-box">
+        <div className="search-input">
+          <div className="terms-box">
+            <input
+              maxLength="200"
+              id={`${props.id}-searchtext`}
+              value={searchText}
+              className=""
+              placeholder={placeholder}
+              enterKeyHint="search"
+              onKeyDown={(event) => {
+                if (event.key === 'Enter') {
+                  onTriggerSearch(searchText);
+                }
+              }}
+              onChange={(event) => {
+                setSearchText(event.target.value);
+                if (isLive) {
+                  onTriggerSearch(event.target.value);
+                }
+              }}
+            />
+
+            <div className="terms-box-left">
+              <div className="input-controls">
+                {searchText && (
+                  <div className="ui button basic clear-button">
+                    <SemanticIcon
+                      tabIndex={0}
+                      name="close"
+                      role="button"
+                      onClick={() => {
+                        setSearchText('');
+                        onTriggerSearch('');
+                      }}
+                      onKeyDown={(event) => {
+                        if (event.key === 'Enter') {
+                          setSearchText('');
+                          onTriggerSearch('');
+                        }
+                      }}
+                    />
+                  </div>
+                )}
+              </div>
+
+              <div
+                tabIndex={0}
+                role="button"
+                className="search-icon"
+                onClick={() => onTriggerSearch(searchText)}
+                onKeyDown={(event) => {
+                  if (event.key === 'Enter') {
+                    onTriggerSearch(searchText);
+                  }
+                }}
+              >
+                <VoltoIcon name={searchSVG} size="29px" />
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    );
+  }
 
   return (
     <div className="search-input">
@@ -21,9 +100,7 @@ const SearchInput = (props) => {
         maxLength="200"
         id={`${props.id}-searchtext`}
         value={searchText}
-        placeholder={
-          data.searchInputPrompt || intl.formatMessage(messages.search)
-        }
+        placeholder={placeholder}
         fluid
         onKeyPress={(event) => {
           if (isLive || event.key === 'Enter') onTriggerSearch(searchText);
@@ -46,7 +123,7 @@ const SearchInput = (props) => {
               onTriggerSearch('');
             }}
           >
-            <Icon name={clearSVG}></Icon>
+            <VoltoIcon name={clearSVG}></VoltoIcon>
           </Button>
         )}
       </div>

package/src/components/Blocks/CustomTemplates/VoltoSearchBlock/icons/search.svg

@@ -0,0 +1,3 @@
+<svg width="38" height="38" viewBox="0 0 38 38" xmlns="http://www.w3.org/2000/svg">
+  <path d="M37.3757 34.3789L30.2003 27.2246C32.5154 24.2751 33.7716 20.633 33.7669 16.8835C33.7669 13.5442 32.7767 10.28 30.9215 7.50351C29.0663 4.72705 26.4295 2.56305 23.3445 1.28518C20.2594 0.00731515 16.8647 -0.327033 13.5897 0.324418C10.3146 0.97587 7.30625 2.58386 4.94506 4.94506C2.58386 7.30625 0.97587 10.3146 0.324418 13.5897C-0.327033 16.8647 0.00731528 20.2594 1.28518 23.3445C2.56305 26.4295 4.72705 29.0664 7.50351 30.9215C10.28 32.7767 13.5442 33.7669 16.8835 33.7669C20.633 33.7716 24.2751 32.5154 27.2246 30.2003L34.3789 37.3757C34.5751 37.5735 34.8085 37.7306 35.0657 37.8377C35.3229 37.9448 35.5987 38 35.8773 38C36.1559 38 36.4318 37.9448 36.689 37.8377C36.9461 37.7306 37.1795 37.5735 37.3757 37.3757C37.5735 37.1795 37.7305 36.9461 37.8377 36.689C37.9448 36.4318 38 36.1559 38 35.8773C38 35.5987 37.9448 35.3229 37.8377 35.0657C37.7305 34.8085 37.5735 34.5751 37.3757 34.3789ZM4.22087 16.8835C4.22087 14.379 4.96352 11.9309 6.3549 9.8485C7.74628 7.76615 9.72391 6.14315 12.0377 5.18475C14.3515 4.22635 16.8975 3.97559 19.3538 4.46418C21.8101 4.95277 24.0664 6.15876 25.8373 7.92966C27.6081 9.70055 28.8141 11.9568 29.3027 14.4131C29.7913 16.8694 29.5406 19.4154 28.5822 21.7292C27.6238 24.043 26.0008 26.0206 23.9184 27.412C21.8361 28.8034 19.3879 29.546 16.8835 29.546C13.5251 29.546 10.3043 28.2119 7.92966 25.8373C5.55496 23.4626 4.22087 20.2418 4.22087 16.8835Z" />
+</svg>

package/src/components/Blocks/CustomTemplates/VoltoSearchBlock/searchDesign.js

@@ -0,0 +1,8 @@
+export const usesGlobalSearchDesign = ({ data, location, path }) => {
+  const currentPath = location?.pathname || path || '';
+  const normalizedPath = currentPath.replace(/\/$/, '');
+  return (
+    data?.listingBodyTemplate === 'CclGlobalSearch' ||
+    normalizedPath.endsWith('/dataset-catalog')
+  );
+};

package/src/components/CclCard/CclCard.jsx

@@ -2,7 +2,7 @@ import PropTypes from 'prop-types';
 import { FormattedMessage } from 'react-intl';
 import { useSelector } from 'react-redux';
 import { Link } from 'react-router-dom';
-import { Icon, Label } from 'semantic-ui-react';
+import { Icon } from 'semantic-ui-react';
 
 import { flattenToAppURL } from '@plone/volto/helpers/Url/Url';
 import { UniversalLink, Icon as VoltoIcon } from '@plone/volto/components';
@@ -59,7 +59,7 @@ const CardLink = ({ url, children, className, condition = true }) => {
   );
 };
 
-const DocCard = ({ card, url, showEditor, children }) => {
+const DocCard = ({ card, url, showEditor, hideSize = false, children }) => {
   return (
     <>
       <div className="card-doc-header">
@@ -104,7 +104,7 @@ const DocCard = ({ card, url, showEditor, children }) => {
             </Link>
           )}
         </div>
-        {card?.['@type'] === 'TechnicalLibrary' && (
+        {card?.['@type'] === 'TechnicalLibrary' && !hideSize && (
           <div className="card-doc-size">{card.getObjSize || ''}</div>
         )}
       </div>
@@ -317,16 +317,30 @@ function CclCard(props) {
               </>
             )}
             {type === 'globalSearch' && (
-              <>
-                <Label ribbon="right" color="olive">
-                  {content_type}
-                </Label>
-                <DocCard card={card} url={url} showEditor={showEditor}>
-                  {children}
+              <div className="global-search-result-row">
+                <div className="global-search-result-main">
+                  <DocCard
+                    card={card}
+                    url={url}
+                    showEditor={showEditor}
+                    hideSize
+                  >
+                    {children}
 
-                  <SearchResultExtras content={card} />
-                </DocCard>
-              </>
+                    <SearchResultExtras content={card} />
+                  </DocCard>
+                </div>
+                <div className="global-search-result-side">
+                  <span className="global-search-result-type">
+                    {content_type}
+                  </span>
+                  {card?.['@type'] === 'TechnicalLibrary' && (
+                    <span className="global-search-result-size">
+                      {card.getObjSize || ''}
+                    </span>
+                  )}
+                </div>
+              </div>
             )}
             {(type === 'block' || type === 'threeColumns') && (
               <>

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,
       ],
     );
 

package/theme/site/extras/menu.less

@@ -289,6 +289,463 @@
   font-size: 0.8rem;
 }
 
+body.global-search-page h1.documentFirstHeading {
+  padding-bottom: 1rem;
+  border-bottom: 1px solid @clmsGreen;
+  margin-bottom: 0.7rem;
+  color: #273b4b;
+  font-size: 32px;
+  line-height: 1.15;
+}
+
+body.global-search-page .block.search.global-search-block {
+  margin-top: 0;
+}
+
+body.global-search-page.section-global-search #page-document > p {
+  margin-bottom: 0;
+  line-height: 1.35;
+}
+
+body.global-search-page.section-global-search #page-document > p strong:empty {
+  display: none;
+}
+
+body.global-search-page.section-global-search
+  #page-document
+  > p:has(strong:empty) {
+  display: none;
+}
+
+body.global-search-page.section-global-search
+  .block.search.global-search-block {
+  margin-top: 3rem;
+}
+
+body.global-search-page.section-dataset-catalog
+  .block.search.global-search-block {
+  margin-top: 1.5rem;
+}
+
+body.global-search-page .block.search.global-search-block .ui.grid {
+  margin: 0;
+}
+
+body.global-search-page .block.search.global-search-block .ui.grid > .row {
+  padding-top: 0;
+}
+
+body.global-search-page
+  .block.search.global-search-block
+  .ui.grid
+  > .row
+  > .column {
+  padding-right: 0;
+  padding-left: 0;
+}
+
+body.global-search-page .block.search.global-search-block .sui-search-box {
+  margin: 0 0 0.6rem;
+}
+
+body.global-search-page .block.search.global-search-block .search-box-hint p {
+  margin: 0;
+  color: #273b4b;
+  font-size: 0.75rem;
+}
+
+body.global-search-page .block.search.global-search-block .global-search-count {
+  padding-bottom: 0.5rem;
+  border-bottom: 2px solid fade(#273b4b, 20%);
+  margin-top: 1.75rem;
+}
+
+body.global-search-page
+  .block.search.global-search-block
+  .global-search-count
+  .search-details {
+  margin: 0;
+  color: #273b4b;
+  font-size: 0.95rem;
+  font-weight: 700;
+}
+
+body.global-search-page
+  .block.search.global-search-block
+  .global-search-above-results {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 0.55rem 0 1.4rem;
+  margin: 0;
+}
+
+body.global-search-page
+  .block.search.global-search-block
+  .global-search-filters-left,
+body.global-search-page
+  .block.search.global-search-block
+  .global-search-applied-filters,
+body.global-search-page
+  .block.search.global-search-block
+  .global-search-sorting {
+  display: flex;
+  align-items: center;
+}
+
+body.global-search-page
+  .block.search.global-search-block
+  .global-search-filters-left {
+  gap: 1rem;
+}
+
+body.global-search-page
+  .block.search.global-search-block
+  .global-search-filters-left
+  .filters-element {
+  margin-left: 0;
+}
+
+body.global-search-page
+  .block.search.global-search-block
+  .global-search-filters-left
+  .filters-title {
+  align-items: center;
+}
+
+body.global-search-page
+  .block.search.global-search-block
+  .global-search-filters-left
+  .filters-title
+  .global-search-categories-icon {
+  display: inline-flex;
+  width: 16px !important;
+  height: 16px !important;
+  align-items: center;
+  justify-content: center;
+  margin-right: 0.35rem;
+  background: @clmsGreen;
+  border-radius: 50%;
+  color: #fff;
+}
+
+body.global-search-page
+  .block.search.global-search-block
+  .global-search-filters-left
+  .global-search-categories-icon
+  .global-search-categories-filter-icon {
+  display: block;
+  color: #fff;
+}
+
+body.global-search-page
+  .block.search.global-search-block
+  .global-search-applied-filters {
+  color: #808080;
+  gap: 0.25rem;
+}
+
+body.global-search-page
+  .block.search.global-search-block
+  .global-search-applied-filters
+  .ui.basic.button {
+  padding: 0 !important;
+  border: none;
+  box-shadow: none !important;
+  color: #808080 !important;
+}
+
+body.global-search-page
+  .block.search.global-search-block
+  .global-search-sorting {
+  gap: 0.7rem;
+}
+
+body.global-search-page
+  .block.search.global-search-block
+  .global-search-sort-label {
+  color: #273b4b;
+}
+
+body.global-search-page
+  .block.search.global-search-block
+  .global-search-sorting
+  button {
+  padding: 0;
+  border: 0;
+  background: transparent;
+  color: #808080;
+  cursor: pointer;
+  font: inherit;
+  font-weight: 700;
+}
+
+body.global-search-page
+  .block.search.global-search-block
+  .global-search-sorting
+  button.active,
+body.global-search-page
+  .block.search.global-search-block
+  .global-search-sorting
+  button:hover {
+  color: @clmsGreen;
+}
+
+body.global-search-page
+  .block.search.global-search-block
+  .global-search-sorting
+  button:first-of-type {
+  color: #808080;
+}
+
+body.global-search-page
+  .block.search.global-search-block
+  .global-search-sort-direction {
+  margin-left: 0.25rem;
+  color: #808080;
+  font-size: 0.75rem;
+}
+
+body.global-search-page .block.search.global-search-block .card-doc {
+  padding: 0;
+  border-bottom: 1px solid #cfd5d8;
+}
+
+body.global-search-page
+  .block.search.global-search-block
+  .global-search-result-row {
+  display: grid;
+  padding: 1.15rem 0 1.05rem;
+  column-gap: 1.5rem;
+  grid-template-columns: minmax(0, 1fr) auto;
+}
+
+body.global-search-page
+  .block.search.global-search-block
+  .global-search-result-main {
+  min-width: 0;
+}
+
+body.global-search-page
+  .block.search.global-search-block
+  .global-search-result-main
+  .card-doc-header {
+  display: block;
+}
+
+body.global-search-page
+  .block.search.global-search-block
+  .global-search-result-main
+  .card-doc-title {
+  margin-bottom: 0.85rem;
+  font-size: 20px;
+  line-height: 1.25;
+}
+
+body.global-search-page
+  .block.search.global-search-block
+  .global-search-result-main
+  .card-doc-title
+  a {
+  color: @clmsGreen;
+}
+
+body.global-search-page
+  .block.search.global-search-block
+  .global-search-result-main
+  .card-doc-description {
+  margin-bottom: 0.35rem;
+}
+
+body.global-search-page
+  .block.search.global-search-block
+  .global-search-result-main
+  .card-doc-extrametadata {
+  color: #34495e;
+  font-size: 16px;
+}
+
+body.global-search-page
+  .block.search.global-search-block
+  .global-search-result-side {
+  display: flex;
+  flex-direction: column;
+  align-items: flex-end;
+  padding-top: 0.05rem;
+  color: #34495e;
+  gap: 1.15rem;
+  white-space: nowrap;
+}
+
+body.global-search-page
+  .block.search.global-search-block
+  .global-search-result-type {
+  padding: 0.25rem 0.55rem;
+  background: #e6e6e6;
+  border-radius: 4px;
+  color: #555;
+  font-size: 12px;
+  line-height: 1;
+}
+
+body.global-search-page
+  .block.search.global-search-block
+  .global-search-result-size {
+  font-size: 14px;
+}
+
+@media (max-width: 1127px) {
+  body.global-search-page.searchlib-page div#page-document.ui.container,
+  body.global-search-page.searchlib-page div#page-document {
+    width: calc(100% - 2rem) !important;
+    max-width: calc(100% - 2rem) !important;
+    padding-right: 1rem;
+    padding-left: 1rem;
+  }
+
+  body.global-search-page .block.search.global-search-block {
+    padding-right: 0;
+    padding-left: 0;
+  }
+}
+
+@media (max-width: 767px) {
+  body.global-search-page.searchlib-page div#page-document.ui.container,
+  body.global-search-page.searchlib-page div#page-document {
+    padding-right: 0.75rem;
+    padding-left: 0.75rem;
+  }
+
+  body.global-search-page h1.documentFirstHeading {
+    padding-bottom: 0.75rem;
+    margin-bottom: 0.75rem;
+    font-size: 28px;
+  }
+
+  body.global-search-page
+    .block.search.global-search-block
+    .sui-search-box
+    .search-input
+    .terms-box
+    input {
+    min-width: 0;
+  }
+
+  body.global-search-page
+    .block.search.global-search-block
+    .sui-search-box
+    .search-input
+    .terms-box
+    .input-controls
+    .clear-button {
+    width: 24px;
+    height: 24px;
+    margin: 0 0.35rem 0.35rem 0;
+  }
+
+  body.global-search-page .block.search.global-search-block .search-box-hint p {
+    font-size: 0.72rem;
+    line-height: 1.35;
+  }
+
+  body.global-search-page
+    .block.search.global-search-block
+    .global-search-count {
+    margin-top: 1.1rem;
+  }
+
+  body.global-search-page
+    .block.search.global-search-block
+    .global-search-above-results,
+  body.global-search-page
+    .block.search.global-search-block
+    .global-search-result-row {
+    display: flex;
+    flex-direction: column;
+    gap: 0.75rem;
+  }
+
+  body.global-search-page
+    .block.search.global-search-block
+    .global-search-above-results {
+    align-items: stretch;
+    padding-bottom: 1rem;
+  }
+
+  body.global-search-page
+    .block.search.global-search-block
+    .global-search-filters-left {
+    flex-wrap: wrap;
+    align-items: flex-start;
+    gap: 0.5rem 0.85rem;
+  }
+
+  body.global-search-page
+    .block.search.global-search-block
+    .global-search-sorting {
+    width: 100%;
+    flex-wrap: nowrap;
+    align-items: center;
+    justify-content: flex-start;
+    gap: 0.45rem 0.7rem;
+  }
+
+  body.global-search-page
+    .block.search.global-search-block
+    .global-search-result-row {
+    padding: 0.95rem 0;
+  }
+
+  body.global-search-page
+    .block.search.global-search-block
+    .global-search-result-main
+    .card-doc-title {
+    margin-bottom: 0.55rem;
+    font-size: 18px;
+    line-height: 1.3;
+  }
+
+  body.global-search-page
+    .block.search.global-search-block
+    .global-search-result-main
+    .card-doc-extrametadata {
+    font-size: 14px;
+    line-height: 1.4;
+  }
+
+  body.global-search-page
+    .block.search.global-search-block
+    .global-search-result-side {
+    flex-direction: row;
+    flex-wrap: wrap;
+    align-items: flex-start;
+    gap: 0.5rem;
+    white-space: normal;
+  }
+
+  body.global-search-page
+    .block.search.global-search-block
+    .ui.pagination.menu {
+    width: 100%;
+    max-width: 100%;
+    justify-content: flex-start;
+    overflow-x: auto;
+  }
+
+  body.global-search-page
+    .block.search.global-search-block
+    .ui.pagination.menu
+    .item {
+    flex: 0 0 auto;
+  }
+}
+
+@media (max-width: 420px) {
+  body.global-search-page h1.documentFirstHeading {
+    font-size: 26px;
+  }
+}
+
 /* Filters */
 .filters-container {
   display: flex;