@eeacms/volto-eea-design-system 1.61.4 → 1.61.6

package/CHANGELOG.md

@@ -4,7 +4,27 @@ 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.61.4](https://github.com/eea/volto-eea-design-system/compare/1.61.3...1.61.4) - 5 October 2026
+### [1.61.6](https://github.com/eea/volto-eea-design-system/compare/1.61.5...1.61.6) - 26 October 2026
+
+#### :bug: Bug Fixes
+
+- fix: remove flagged comments by css:S125 [ana-oprea - [`2fd68ca`](https://github.com/eea/volto-eea-design-system/commit/2fd68ca8d7a0457be7fcf67505966ea9d8332a1c)]
+- fix: Error upgrading eea-website-frontend to the latest Volto 18.x.x - refs #309318 [ana-oprea - [`eabfffd`](https://github.com/eea/volto-eea-design-system/commit/eabfffd36dcd8d3f980ba71e95aa44a034e71902)]
+
+### [1.61.5](https://github.com/eea/volto-eea-design-system/compare/1.61.4...1.61.5) - 7 October 2026
+
+#### :rocket: New Features
+
+- feat(subsite): use optional useAISearchIcon for subsite passed via headerSearch Controlpanel refs#308136 [nileshgulia1 - [`5c5bebc`](https://github.com/eea/volto-eea-design-system/commit/5c5bebcb47e99168553d3f811493ec7d98858c0e)]
+
+#### :nail_care: Enhancements
+
+- refactor: only turn off the site wide ai search action when subsite wants it. [nileshgulia1 - [`1cf5bed`](https://github.com/eea/volto-eea-design-system/commit/1cf5bed4bb4f5942635aabf2009f128171704a80)]
+
+#### :hammer_and_wrench: Others
+
+- Merge pull request #552 from eea/develop [Nilesh - [`a83b0c1`](https://github.com/eea/volto-eea-design-system/commit/a83b0c174f41da449c6c0d9ee720ec4b9a74b095)]
+### [1.61.4](https://github.com/eea/volto-eea-design-system/compare/1.61.3...1.61.4) - 6 October 2026
 
 #### :rocket: New Features
 
@@ -128,9 +148,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - feat: Volto 18 support - refs #287700 [Alin Voinea - [`6d4f49c`](https://github.com/eea/volto-eea-design-system/commit/6d4f49c3c2a2bfae2ff1b01df6c9e1ec3b13efc5)]
 - feat(Header): replace search icon with ai variant [Miu Razvan - [`af211a9`](https://github.com/eea/volto-eea-design-system/commit/af211a933bb5499036b7be24b75a2949fa791cea)]
 
-#### :house: Internal changes
-
-
 #### :hammer_and_wrench: Others
 
 - tests: Fix Sonar Qube tags - refs #297339 [Alin Voinea - [`248553d`](https://github.com/eea/volto-eea-design-system/commit/248553d47d053514f512178793f64d382711c57e)]
@@ -355,8 +372,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - perf(inpage): render in page navigation only when hidden class changes [David Ichim - [`bce09b2`](https://github.com/eea/volto-eea-design-system/commit/bce09b276b1d181abc21623794ff1574e99160c5)]
 ### [1.31.1](https://github.com/eea/volto-eea-design-system/compare/1.31.0...1.31.1) - 7 June 2024
 
-#### :hammer_and_wrench: Others
-
 ### [1.31.0](https://github.com/eea/volto-eea-design-system/compare/1.23.8...1.31.0) - 22 May 2024
 
 #### :boom: Breaking Change
@@ -383,8 +398,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 - fix(inpage-navigation): warning Can't perform a React state update on an unmounted component [David Ichim - [`1192493`](https://github.com/eea/volto-eea-design-system/commit/119249384f8f7f4dab6a4c093c182b5dd12bb4f6)]
 
-#### :hammer_and_wrench: Others
-
 ### [1.23.5](https://github.com/eea/volto-eea-design-system/compare/1.23.4...1.23.5) - 5 April 2024
 
 #### :nail_care: Enhancements
@@ -671,7 +684,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - fix [Dobricean Ioan Dorian - [`615e67f`](https://github.com/eea/volto-eea-design-system/commit/615e67ff3c9a0fbd6cc7cadbb0c845bf09eec4f0)]
 - remove [Dobricean Ioan Dorian - [`bf3974b`](https://github.com/eea/volto-eea-design-system/commit/bf3974be18225c893fd09814cb2aca9a84ba0ece)]
 - fix popper [Dobricean Ioan Dorian - [`762f199`](https://github.com/eea/volto-eea-design-system/commit/762f199ff5725e7ad1fb788feb4f7b7548d1ee44)]
-- test: Update Makefile and docker-compose to align it with Jenkinsfile [valentinab25 - [`b7eea21`](https://github.com/eea/volto-eea-design-system/commit/b7eea21fd4e71c4f420cd061717166483082dd6e)]
 ### [1.16.0](https://github.com/eea/volto-eea-design-system/compare/1.15.0...1.16.0) - 17 August 2023
 
 #### :rocket: New Features
@@ -808,9 +820,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - change(footer): add dedicated classes for theme sites logos [David Ichim - [`adebd04`](https://github.com/eea/volto-eea-design-system/commit/adebd04bcf5dc5b28b90db540816384fc60b4073)]
 - change(footer): header can now be added anywhere in the footer section [David Ichim - [`6ae4872`](https://github.com/eea/volto-eea-design-system/commit/6ae48728dd961d783c6a8120c8a88dc38f63eed6)]
 
-#### :house: Internal changes
-
-
 #### :house: Documentation changes
 
 - docs: Update and rename Corporate-site-templates to 2-corporate-site-templates.md [Antonio De Marinis - [`41ffc55`](https://github.com/eea/volto-eea-design-system/commit/41ffc5545def9034e3955bf967a2b0b947023528)]
@@ -1466,7 +1475,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - bump package version [David Ichim - [`b4628be`](https://github.com/eea/volto-eea-design-system/commit/b4628bed134abc76e38a243d4e98143e19cef989)]
 - feature(docusaurus, storybook): logos selection for sites plus inverted options #253 from eea/doc-logo-page [ichim-david - [`dbfc90d`](https://github.com/eea/volto-eea-design-system/commit/dbfc90d035dc40e9d4054347f00fde4de486d63d)]
 - (feat): Add ability to disable the language select from website top menu  - refs #158616 [dobri1408 - [`411c8e4`](https://github.com/eea/volto-eea-design-system/commit/411c8e4afaf0b2b9edfdeeecdca22aa4cc41f329)]
-- test(Jenkins): Run tests and cypress with latest canary @plone/volto [Alin Voinea - [`92feea0`](https://github.com/eea/volto-eea-design-system/commit/92feea09796c9ef0530f65fa1d34139905133215)]
 - Proof reading page header section [ichim-david - [`230239e`](https://github.com/eea/volto-eea-design-system/commit/230239e1b22734fb8606656985bc5e513731e244)]
 ### [1.0.0-alpha.7](https://github.com/eea/volto-eea-design-system/compare/1.0.0-alpha.6...1.0.0-alpha.7) - 16 December 2022
 
@@ -3223,7 +3231,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - refactor(header): adjust to volto in progress [ITML - [`760beca`](https://github.com/eea/volto-eea-design-system/commit/760becabf40dbbaed36dac6c37275c7e31aa2509)]
 - refactor(banner): actions as buttons; don't hardcode url for banner image; subcomponentize Banner, add Banner.Action; add developer guidelines on inline styles and line endings; [Tiberiu Ichim - [`6dd5a41`](https://github.com/eea/volto-eea-design-system/commit/6dd5a41248e8bf4095744bd89217707f3ad820a1)]
 - refactor(Image): change image path [ITML - [`a580da6`](https://github.com/eea/volto-eea-design-system/commit/a580da68a45bbe68d314f60e9495fc321489caf5)]
-- change(infrastructure) cherry-pick fix 9639243 skipping jenkins on auto commits [David Ichim - [`fc744cd`](https://github.com/eea/volto-eea-design-system/commit/fc744cda5a4e6d9da0ab6e7f92868d53f28f53c1)]
 - change(infrastructure): modify whats new doc when committing the auto deployment [David Ichim - [`39df33e`](https://github.com/eea/volto-eea-design-system/commit/39df33ed946a8167e4954cffb676144700e0ec38)]
 - change(blockquote): introduce float argument for blockquote with image storybook [David Ichim - [`8fc7290`](https://github.com/eea/volto-eea-design-system/commit/8fc72906c264b5e96702f8518e81d5724b494a5c)]
 - change(infrastructure): specify that docs folder contains changes for deployment [David Ichim - [`a1ca915`](https://github.com/eea/volto-eea-design-system/commit/a1ca9153b70e3525cd73423d059a8607f63fc2b9)]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-eea-design-system",
-  "version": "1.61.4",
+  "version": "1.61.6",
   "description": "@eeacms/volto-eea-design-system: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",

package/src/semantic.less

@@ -73,18 +73,10 @@
   @import '~semantic-ui-less/definitions/elements/rail';
 }
 
-//& {
-//  @import '~semantic-ui-less/definitions/elements/reveal';
-//}
-
 & {
   @import '~semantic-ui-less/definitions/elements/segment';
 }
 
-//& {
-//  @import '~semantic-ui-less/definitions/elements/step';
-//}
-
 /* Collections */
 & {
   @import '~semantic-ui-less/definitions/collections/breadcrumb';
@@ -111,10 +103,6 @@
 }
 
 /* Views */
-//& {
-//  @import '~semantic-ui-less/definitions/views/ad';
-//}
-
 & {
   @import '~semantic-ui-less/definitions/views/card';
 }
@@ -123,14 +111,6 @@
   @import '~semantic-ui-less/definitions/views/comment';
 }
 
-//& {
-//  @import '~semantic-ui-less/definitions/views/feed';
-//}
-
-// & {
-//   @import '~semantic-ui-less/definitions/views/item';
-// }
-
 & {
   @import '@eeacms/volto-eea-design-system/../theme/themes/eea/definitions/views/item';
 }
@@ -164,10 +144,6 @@
   @import '~semantic-ui-less/definitions/modules/modal';
 }
 
-//& {
-//  @import '~semantic-ui-less/definitions/modules/nag';
-//}
-
 & {
   @import '~semantic-ui-less/definitions/modules/popup';
 }
@@ -176,18 +152,10 @@
   @import '~semantic-ui-less/definitions/modules/progress';
 }
 
-//& {
-//  @import '~semantic-ui-less/definitions/modules/rating';
-//}
-
 & {
   @import '~semantic-ui-less/definitions/modules/search';
 }
 
-//& {
-//  @import '~semantic-ui-less/definitions/modules/shape';
-//}
-
 & {
   @import '~semantic-ui-less/definitions/modules/sidebar';
 }

package/src/ui/Header/Header.jsx

@@ -17,7 +17,11 @@ import burgerIcon from '@eeacms/volto-eea-design-system/../theme/themes/eea/asse
 import HeaderSearchPopUp from './HeaderSearchPopUp';
 import HeaderMenuPopUp from './HeaderMenuPopUp';
 import { useAISummaryToggle } from './useAISummaryToggle';
-import { findBestMatchingMenuItem, isMenuItemActive } from './utils';
+import {
+  findBestMatchingMenuItem,
+  getSearchInput,
+  isMenuItemActive,
+} from './utils';
 import PropTypes from 'prop-types';
 import omit from 'lodash/omit';
 import { isInternalURL } from '@plone/volto/helpers/Url/Url';
@@ -162,10 +166,16 @@ const Main = ({
   const [burger, setBurger] = React.useState('');
   const searchInputRef = React.useRef(null);
   const [isClient, setIsClient] = React.useState();
-  const useAISearchIcon = useSelector(
+  const siteUseAISearchIcon = useSelector(
     (state) =>
       state.reduxAsyncConnect?.headerSettings?.useAISearchIcon || false,
   );
+  // The search box matching the current path can turn the site-wide icon off
+  const useAISearchIcon =
+    siteUseAISearchIcon &&
+    (getSearchInput(headerSearchBox || [], { pathname: pathname || '' })
+      .useAISearchIcon ??
+      true);
 
   const [aiSummaryEnabled] = useAISummaryToggle();
 

package/src/ui/Header/Header.test.jsx

@@ -772,12 +772,13 @@ test('menu click outside behavior with different active states', async () => {
 });
 
 describe('header search icon and AI summary state', () => {
-  const renderMain = () =>
+  const renderMain = (props = {}) =>
     renderWithProvider(
       <Router history={createMemoryHistory()}>
         <Header>
           <Header.Main
             pathname="/test"
+            {...props}
             menuItems={[
               { '@id': '/test', url: '/test', title: 'Test', items: [] },
             ]}
@@ -824,4 +825,37 @@ describe('header search icon and AI summary state', () => {
       'search-line.svg',
     );
   });
+
+  describe('search box useAISearchIcon override', () => {
+    const headerSearchBox = [
+      { type: 'search-input', path: '/search' },
+      {
+        type: 'search-input',
+        matchpath: '/en/epanet',
+        path: '/en/epanet/site-search',
+        useAISearchIcon: false,
+      },
+    ];
+
+    it('shows the plain magnifier in the search box path that turns the AI icon off', () => {
+      mockState.reduxAsyncConnect.headerSettings.useAISearchIcon = true;
+
+      const { container } = renderMain({
+        pathname: '/en/epanet/about',
+        headerSearchBox,
+      });
+      expect(
+        container.querySelector('img[alt="Global search"]'),
+      ).toHaveAttribute('src', 'search-line.svg');
+    });
+
+    it('keeps the site-wide AI sparkle outside that path', () => {
+      mockState.reduxAsyncConnect.headerSettings.useAISearchIcon = true;
+
+      const { container } = renderMain({ pathname: '/en', headerSearchBox });
+      expect(
+        container.querySelector('img[alt="Global search"]'),
+      ).toHaveAttribute('src', 'ai-search.svg');
+    });
+  });
 });

package/src/ui/Header/HeaderSearchPopUp.js

@@ -10,6 +10,7 @@ import { handleEnterKeyPress } from '@eeacms/volto-eea-design-system/helpers';
 import searchSVG from '@eeacms/volto-eea-design-system/../theme/themes/eea/assets/images/Header/search-line.svg';
 import aiSearchIcon from '@eeacms/volto-eea-design-system/../theme/themes/eea/assets/images/Header/ai-search.svg';
 import { useAISummaryToggle } from './useAISummaryToggle';
+import { getSearchInput } from './utils';
 
 const getRandomItems = (arr, max) => {
   return (
@@ -19,18 +20,6 @@ const getRandomItems = (arr, max) => {
   );
 };
 
-const getSearchInput = (config, location) => {
-  return (
-    config.filter(
-      (v) =>
-        v.type === 'search-input' &&
-        location.pathname.match(v.matchpath ? v.matchpath : v.path),
-    )[0] ||
-    config.filter((v) => v.type === 'search-input')[0] ||
-    {}
-  );
-};
-
 const serializeAction = (action, location) => {
   if (action.type === 'info' && isArray(action.content)) {
     const matchedContent =
@@ -97,10 +86,13 @@ function HeaderSearchPopUp({
     getRandomItems(suggestions, maxToShow),
   );
 
-  const useAISearchIcon = useSelector(
+  const siteUseAISearchIcon = useSelector(
     (state) =>
       state.reduxAsyncConnect?.headerSettings?.useAISearchIcon || false,
   );
+  // A search box can turn the site-wide icon off, e.g. a subsite search
+  const useAISearchIcon =
+    siteUseAISearchIcon && (searchInput.useAISearchIcon ?? true);
 
   const [aiSummaryEnabled] = useAISummaryToggle();
 

package/src/ui/Header/HeaderSearchPopUp.test.js

@@ -340,6 +340,35 @@ describe('HeaderSearchPopUp', () => {
     });
   });
 
+  describe('search box useAISearchIcon override', () => {
+    beforeEach(() => {
+      window.localStorage.clear();
+    });
+
+    const renderWithEntry = (entry) =>
+      render(
+        <Provider store={mockStore}>
+          <Router history={history}>
+            <HeaderSearchPopUp
+              headerSearchBox={[{ ...sampleHeaderSearchBox[0], ...entry }]}
+              onClose={mockOnClose}
+              triggerRefs={[]}
+            />
+          </Router>
+        </Provider>,
+      );
+
+    it('shows the plain magnifier when the search box turns the AI icon off', () => {
+      mockState.reduxAsyncConnect.headerSettings.useAISearchIcon = true;
+
+      const { container } = renderWithEntry({ useAISearchIcon: false });
+      expect(container.querySelector('img')).toHaveAttribute(
+        'src',
+        'search-line.svg',
+      );
+    });
+  });
+
   describe('hideActions', () => {
     const renderWith = (headerSearchBox) =>
       render(

package/src/ui/Header/utils.js

@@ -91,3 +91,24 @@ export const numbersToMenuItemColumns = (numbers) => {
     })
     .filter((col) => col !== '');
 };
+
+/**
+ * Finds the search-input entry of the header search box config that matches
+ * the current path (its matchpath, else its path), falling back to the first
+ * search-input entry.
+ *
+ * @param {Array} config - headerSearchBox entries
+ * @param {Object} location - object with a pathname
+ * @returns {Object} The matched search-input entry, or {}
+ */
+export const getSearchInput = (config, location) => {
+  return (
+    config.filter(
+      (v) =>
+        v.type === 'search-input' &&
+        location.pathname.match(v.matchpath ? v.matchpath : v.path),
+    )[0] ||
+    config.filter((v) => v.type === 'search-input')[0] ||
+    {}
+  );
+};

package/theme/themes/eea/globals/site.variables

@@ -129,6 +129,10 @@
 /* Global focus-visible for accessibility */
 @focusVisibleOutline: .2rem auto var(--focus-visible, @blue-2);
 
+/* Used by Volto's pastanaga extras/focus.less (Volto >= 18.36.0) */
+@innerFocusShadow: transparent;
+@outerFocusOutline: var(--focus-visible, @blue-2);
+
 /* Used on inputs, textarea etc */
 @focusedFormBorderColor: @secondaryColor;