@eeacms/volto-eea-website-theme 4.3.0 → 4.3.2

package/CHANGELOG.md

@@ -4,11 +4,19 @@ 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).
 
-### [4.3.0](https://github.com/eea/volto-eea-website-theme/compare/4.2.0...4.3.0) - 23 April 2026
+### [4.3.2](https://github.com/eea/volto-eea-website-theme/compare/4.3.1...4.3.2) - 15 May 2026
 
-#### :rocket: New Features
+#### :bug: Bug Fixes
+
+- fix(Header): use navroot language to fetch navigation, fix subsite case - refs #303244 [Miu Razvan - [`c25711e`](https://github.com/eea/volto-eea-website-theme/commit/c25711ec3f8492d442c9a130e5e4cb9feb1e80ad)]
+
+### [4.3.1](https://github.com/eea/volto-eea-website-theme/compare/4.3.0...4.3.1) - 14 May 2026
+
+#### :bug: Bug Fixes
+
+- fix: Scheduled label in contents - refs #303325 [Teodor Voicu - [`7c7d4d4`](https://github.com/eea/volto-eea-website-theme/commit/7c7d4d43ced32570f2ea1dd104992f5da4164594)]
 
-- feat: Align Toast with EEA Design System Message - refs #294806 [Alin Voinea - [`53106b1`](https://github.com/eea/volto-eea-website-theme/commit/53106b1099b4bfae59a1746e7dc62c49a8ae63cd)]
+### [4.3.0](https://github.com/eea/volto-eea-website-theme/compare/4.2.0...4.3.0) - 24 April 2026
 
 #### :hammer_and_wrench: Others
 
@@ -77,6 +85,8 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 #### :house: Internal changes
 
+- chore: [JENKINSFILE] add package version in sonarqube [valentinab25 - [`b15b302`](https://github.com/eea/volto-eea-website-theme/commit/b15b302ff88ec6afa6901ee7e1726cc4e04a8739)]
+- chore: [JENKINSFILE] use sonarqube branches [EEA Jenkins - [`36f2e1e`](https://github.com/eea/volto-eea-website-theme/commit/36f2e1e176471b3753d77ab8aaf0cba577b43b36)]
 
 ### [3.19.0](https://github.com/eea/volto-eea-website-theme/compare/3.18.1...3.19.0) - 11 February 2026
 
@@ -139,6 +149,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 #### :hammer_and_wrench: Others
 
 - Release 3.12.0 [Alin Voinea - [`ea1e961`](https://github.com/eea/volto-eea-website-theme/commit/ea1e96144684b2a8238ae476fd8d47de82ff42b4)]
+- Add Sonarqube tag using bise-frontend addons list [EEA Jenkins - [`2cac56e`](https://github.com/eea/volto-eea-website-theme/commit/2cac56e22e580e042d368b69254172539ed33b65)]
 ### [3.11.0](https://github.com/eea/volto-eea-website-theme/compare/3.10.1...3.11.0) - 29 September 2025
 
 #### :bug: Bug Fixes
@@ -232,6 +243,8 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 #### :hammer_and_wrench: Others
 
+- Add Sonarqube tag using fise-frontend addons list [EEA Jenkins - [`3d50874`](https://github.com/eea/volto-eea-website-theme/commit/3d50874281ebcb91a1ae3727248f656a6f26c603)]
+- Add Sonarqube tag using ied-frontend addons list [EEA Jenkins - [`a3f7676`](https://github.com/eea/volto-eea-website-theme/commit/a3f76767d99cb6dd93cc7fa0eafdea57e9000b2c)]
 ### [3.5.4](https://github.com/eea/volto-eea-website-theme/compare/3.5.3...3.5.4) - 30 January 2025
 
 #### :bug: Bug Fixes
@@ -332,6 +345,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 #### :hammer_and_wrench: Others
 
+- Add Sonarqube tag using bise-frontend addons list [EEA Jenkins - [`e417f83`](https://github.com/eea/volto-eea-website-theme/commit/e417f839312045c56b67ab8134fe5b0622b3e2c3)]
 ## [3.0.0](https://github.com/eea/volto-eea-website-theme/compare/2.4.0...3.0.0) - 21 October 2024
 
 #### :nail_care: Enhancements
@@ -417,6 +431,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - Refs #269520 - other_organisation test [Tripon Eugen - [`7558b27`](https://github.com/eea/volto-eea-website-theme/commit/7558b27a9d1cd6d3480a32b296c7325c796006c9)]
 - Refs #269520 - other_organisation token widget edit mode [Tripon Eugen - [`b6df127`](https://github.com/eea/volto-eea-website-theme/commit/b6df127bd91b6f55dda8f468e1107037d43752ff)]
 - Refs #269520 - other_organisation token widget [Tripon Eugen - [`6fd7543`](https://github.com/eea/volto-eea-website-theme/commit/6fd7543894bd2c593a1729116befd95c82ea3c8f)]
+- Add Sonarqube tag using marine-frontend addons list [EEA Jenkins - [`cbc36c7`](https://github.com/eea/volto-eea-website-theme/commit/cbc36c74dfcd5f7cb1013a4c673d9c02e0023766)]
 ### [2.1.1](https://github.com/eea/volto-eea-website-theme/compare/2.1.0...2.1.1) - 28 May 2024
 
 #### :bug: Bug Fixes
@@ -501,6 +516,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 #### :hammer_and_wrench: Others
 
+- Add Sonarqube tag using insitu-frontend addons list [EEA Jenkins - [`adc6730`](https://github.com/eea/volto-eea-website-theme/commit/adc6730e21a37afb865b842182624401de6a29f5)]
 ### [1.33.1](https://github.com/eea/volto-eea-website-theme/compare/1.33.0...1.33.1) - 4 April 2024
 
 #### :bug: Bug Fixes
@@ -634,6 +650,8 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 - bump version [Razvan - [`721e939`](https://github.com/eea/volto-eea-website-theme/commit/721e939d12e324b459ebfa78a2e656ee7142a3d6)]
 - merge master into this branch [Razvan - [`586c8f9`](https://github.com/eea/volto-eea-website-theme/commit/586c8f910bac55a043bd8dda60e9444bd2ae1663)]
+- Add Sonarqube tag using freshwater-frontend addons list [EEA Jenkins - [`fd90044`](https://github.com/eea/volto-eea-website-theme/commit/fd9004442a9d1d465f7601ecdefe3e23c61e6a9c)]
+- Add Sonarqube tag using insitu-frontend addons list [EEA Jenkins - [`4bc3dd3`](https://github.com/eea/volto-eea-website-theme/commit/4bc3dd3ae412a66befd04b5b80fab3716c929240)]
 - test: Update jest,Jenkinsfile,lint to volto-addons-template PR30 [valentinab25 - [`c4dbd28`](https://github.com/eea/volto-eea-website-theme/commit/c4dbd289358205bc2d849aab7edb11ccf3b89cee)]
 - fix tests [Razvan - [`042330b`](https://github.com/eea/volto-eea-website-theme/commit/042330bc97d32ffe7ba769b4f2453f71cffed706)]
 - remove RemoveSchema logic [Razvan - [`08d10f8`](https://github.com/eea/volto-eea-website-theme/commit/08d10f8bf6f75478260e4e4c66d7316ba87b907a)]
@@ -728,6 +746,11 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - test: Add real image to cypress test [Alin Voinea - [`4ff591a`](https://github.com/eea/volto-eea-website-theme/commit/4ff591ae3318c9588b4e2114582c0fa6cfdf31ae)]
 - test: Add cypress tests for Image block styling position and align [Alin Voinea - [`7341ef7`](https://github.com/eea/volto-eea-website-theme/commit/7341ef7b92714fc0cc3ab0c31c39033e7b3e19e7)]
 - Revert "change(tests): commented out rss test since title block config is missing" [Alin Voinea - [`fb61191`](https://github.com/eea/volto-eea-website-theme/commit/fb611918d6ca380b89b594f283dcf9f685a4b294)]
+- test: [JENKINS] Use java17 for sonarqube scanner [valentinab25 - [`6a3be30`](https://github.com/eea/volto-eea-website-theme/commit/6a3be3092589411af7808a235f76de5222fd3868)]
+- test: [JENKINS] Run cypress in started frontend container [valentinab25 - [`c3978f2`](https://github.com/eea/volto-eea-website-theme/commit/c3978f23375ef066e9fd6f6c2e34ba6c1c058f69)]
+- test: [JENKINS] Add cpu limit on cypress docker [valentinab25 - [`f672779`](https://github.com/eea/volto-eea-website-theme/commit/f672779e845bec9240ccc901e9f53ec80c5a1819)]
+- test: [JENKINS] Increase shm-size to cypress docker [valentinab25 - [`ae5d8e3`](https://github.com/eea/volto-eea-website-theme/commit/ae5d8e3f4e04dc2808d47ce2ee886e1b23b528da)]
+- test: [JENKINS] Improve cypress time [valentinab25 - [`170ff0c`](https://github.com/eea/volto-eea-website-theme/commit/170ff0c8e3b30e69479bdf1117e811fea94f1027)]
 ### [1.23.0](https://github.com/eea/volto-eea-website-theme/compare/1.22.1...1.23.0) - 2 November 2023
 
 #### :rocket: New Features
@@ -740,6 +763,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 #### :house: Internal changes
 
+- chore: [JENKINS] Refactor automated testing [valentinab25 - [`f28fce3`](https://github.com/eea/volto-eea-website-theme/commit/f28fce3d1eb815f95fb9aa40de42b10b7e8e30c5)]
 - chore: husky, lint-staged use fixed versions [valentinab25 - [`6d15088`](https://github.com/eea/volto-eea-website-theme/commit/6d150886c5aeb2ca0b569270486e60f7cc274e2c)]
 - chore:volto 16 in tests, update docs, fix stylelint overrides [valentinab25 - [`20c0323`](https://github.com/eea/volto-eea-website-theme/commit/20c032380b33c0077c869a05136f93e2fb68e5d4)]
 
@@ -925,6 +949,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 #### :house: Internal changes
 
+- chore: [JENKINS] Deprecate circularity website [valentinab25 - [`370dcbf`](https://github.com/eea/volto-eea-website-theme/commit/370dcbfbf1a8135ce7b1b3b271b004552a631837)]
 
 #### :hammer_and_wrench: Others
 
@@ -1080,6 +1105,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 #### :hammer_and_wrench: Others
 
+- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`6c5e2f8`](https://github.com/eea/volto-eea-website-theme/commit/6c5e2f80456e2061d9e9c15fd0a0b91b9ac70568)]
 ### [1.9.1](https://github.com/eea/volto-eea-website-theme/compare/1.9.0...1.9.1) - 28 February 2023
 
 #### :bug: Bug Fixes
@@ -1226,6 +1252,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 - For some reasons types is a string [Alin Voinea - [`3769a09`](https://github.com/eea/volto-eea-website-theme/commit/3769a0981181d5b633f3498daebbe96be8b4b833)]
 - Fix(redirect): o.filter - refs #157627 [Alin Voinea - [`deb23da`](https://github.com/eea/volto-eea-website-theme/commit/deb23da846444cc96539697fd798429ae0abe89e)]
+- Add Sonarqube tag using advisory-board-frontend addons list [EEA Jenkins - [`f1fffc5`](https://github.com/eea/volto-eea-website-theme/commit/f1fffc5db96725440863d545580b4e76cce4b796)]
 ### [1.5.0](https://github.com/eea/volto-eea-website-theme/compare/1.4.2...1.5.0) - 9 January 2023
 
 #### :hammer_and_wrench: Others
@@ -1259,6 +1286,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 - Release 1.4.0 [Alin Voinea - [`bd42a0d`](https://github.com/eea/volto-eea-website-theme/commit/bd42a0d26e928cac5d99933194755da3db06b341)]
 - bump version to use as volto-eea-design-system [David Ichim - [`f4be047`](https://github.com/eea/volto-eea-website-theme/commit/f4be047328b46399b03b612d378b18aaf82e7dc1)]
+- Add Sonarqube tag using advisory-board-frontend addons list [EEA Jenkins - [`9b7cfef`](https://github.com/eea/volto-eea-website-theme/commit/9b7cfefb4d34fc1c948015e491feb370f9795bd8)]
 - test(Jenkins): Run tests and cypress with latest canary @plone/volto [Alin Voinea - [`df252a9`](https://github.com/eea/volto-eea-website-theme/commit/df252a9bfed0bb86cadf53c59dd1603b1e2cd822)]
 ### [1.3.2](https://github.com/eea/volto-eea-website-theme/compare/1.3.1...1.3.2) - 16 December 2022
 
@@ -1268,6 +1296,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 #### :hammer_and_wrench: Others
 
+- Add Sonarqube tag using cca-frontend addons list [EEA Jenkins - [`a43c658`](https://github.com/eea/volto-eea-website-theme/commit/a43c658a7920c8df95e763b9a637f38ce77eba2c)]
 - Better razzle.config [Tiberiu Ichim - [`81dbf48`](https://github.com/eea/volto-eea-website-theme/commit/81dbf48815fb27facb4f82c9b764540fdf188b2e)]
 - Better razzle.config [Tiberiu Ichim - [`7bc9da2`](https://github.com/eea/volto-eea-website-theme/commit/7bc9da2cd837ab62a95cd29979cdd9b0055b7d67)]
 ### [1.3.1](https://github.com/eea/volto-eea-website-theme/compare/1.3.0...1.3.1) - 28 November 2022
@@ -1278,6 +1307,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 #### :hammer_and_wrench: Others
 
+- yarn 3 [Alin Voinea - [`ea7a709`](https://github.com/eea/volto-eea-website-theme/commit/ea7a7094945312776e9b6f44e371178603e92139)]
 ### [1.3.0](https://github.com/eea/volto-eea-website-theme/compare/1.2.0...1.3.0) - 22 November 2022
 
 #### :rocket: New Features
@@ -1318,6 +1348,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - Add subsite class to body [Tiberiu Ichim - [`74d700f`](https://github.com/eea/volto-eea-website-theme/commit/74d700fbfd6249a8604762a7e4e49cce857db0f3)]
 - Add subsite info to header [Tiberiu Ichim - [`47daf8b`](https://github.com/eea/volto-eea-website-theme/commit/47daf8bb6374a1222040626b19d4154df7ba1b83)]
 - fix eslint [Miu Razvan - [`eb8d0a7`](https://github.com/eea/volto-eea-website-theme/commit/eb8d0a790bc70c0aae256c6ff35f63c4885f338e)]
+- Add Sonarqube tag using circularity-frontend addons list [EEA Jenkins - [`cc578a4`](https://github.com/eea/volto-eea-website-theme/commit/cc578a413b205a8e61e091fab3a88f94cedefc89)]
 ### [1.1.0](https://github.com/eea/volto-eea-website-theme/compare/1.0.0...1.1.0) - 28 October 2022
 
 #### :nail_care: Enhancements
@@ -1365,6 +1396,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 #### :hammer_and_wrench: Others
 
+- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`33b56ac`](https://github.com/eea/volto-eea-website-theme/commit/33b56acb13fbaf0c5b79e8fc6e13c4b699c79c90)]
 ### [0.7.3](https://github.com/eea/volto-eea-website-theme/compare/0.7.2...0.7.3) - 22 September 2022
 
 #### :hammer_and_wrench: Others
@@ -1632,6 +1664,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - Header refactor, add custom logo #5 [ichim-david - [`4950235`](https://github.com/eea/volto-eea-website-theme/commit/49502358105437cfeac3b144e6d301cb59aa2346)]
 - Update footer.config with new publication card component [ichim-david - [`2e38e9a`](https://github.com/eea/volto-eea-website-theme/commit/2e38e9a417f835009d60c80d4eb4b30229f55e45)]
 - feature(breadcrumbs): implement eea-design-system breadcrumb as Volto component #32 #7 [ichim-david - [`181af41`](https://github.com/eea/volto-eea-website-theme/commit/181af4125ce2b9ddac56dab4723cb11c26633221)]
+- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`da8ceb6`](https://github.com/eea/volto-eea-website-theme/commit/da8ceb68ea68bfbc9504e48ccd4d68277f11ab9a)]
 - use breadcrumbs from eea-design-system [nileshgulia1 - [`db2f9e9`](https://github.com/eea/volto-eea-website-theme/commit/db2f9e9a4327420a3cce9a9903cd88549b129eab)]
 - Update theme.config [ichim-david - [`8eca4f4`](https://github.com/eea/volto-eea-website-theme/commit/8eca4f40397a4aeca6d39029c92db78968d37064)]
 - Added keyContent component to theme.config [ichim-david - [`d86f202`](https://github.com/eea/volto-eea-website-theme/commit/d86f202d0274d839487a88b51cae9a0e899beb23)]
@@ -1673,4 +1706,5 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 #### :hammer_and_wrench: Others
 
+- yarn bootstrap [Alin Voinea - [`6995e9e`](https://github.com/eea/volto-eea-website-theme/commit/6995e9e091f21fdbbdffa8a44fc0e2c626f6d46a)]
 - Initial commit [Alin Voinea - [`6a9c03a`](https://github.com/eea/volto-eea-website-theme/commit/6a9c03a7cebe71ca87e82cf58c42904063e9d8d3)]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-eea-website-theme",
-  "version": "4.3.0",
+  "version": "4.3.2",
   "description": "@eeacms/volto-eea-website-theme: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",

package/src/customizations/volto/components/manage/Contents/ContentsItem.jsx

@@ -0,0 +1,425 @@
+/**
+ * Contents item component.
+ * @module components/manage/Contents/ContentsItem
+ */
+
+import React from 'react';
+import { Button, Table, Menu, Divider } from 'semantic-ui-react';
+import { Link } from 'react-router-dom';
+import PropTypes from 'prop-types';
+import map from 'lodash/map';
+import { useIntl, defineMessages, FormattedMessage } from 'react-intl';
+import Circle from '@plone/volto/components/manage/Contents/circle';
+import FormattedDate from '@plone/volto/components/theme/FormattedDate/FormattedDate';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
+import Popup from '@plone/volto/components/theme/Popup/Popup';
+import { getContentIcon } from '@plone/volto/helpers/Content/Content';
+import moreSVG from '@plone/volto/icons/more.svg';
+import checkboxUncheckedSVG from '@plone/volto/icons/checkbox-unchecked.svg';
+import checkboxCheckedSVG from '@plone/volto/icons/checkbox-checked.svg';
+import cutSVG from '@plone/volto/icons/cut.svg';
+import deleteSVG from '@plone/volto/icons/delete.svg';
+import copySVG from '@plone/volto/icons/copy.svg';
+import showSVG from '@plone/volto/icons/show.svg';
+import moveUpSVG from '@plone/volto/icons/move-up.svg';
+import moveDownSVG from '@plone/volto/icons/move-down.svg';
+import editingSVG from '@plone/volto/icons/editing.svg';
+import dragSVG from '@plone/volto/icons/drag.svg';
+import cx from 'classnames';
+
+import { injectLazyLibs } from '@plone/volto/helpers/Loadable/Loadable';
+
+const messages = defineMessages({
+  private: {
+    id: 'private',
+    defaultMessage: 'Private',
+  },
+  pending: {
+    id: 'pending',
+    defaultMessage: 'Pending',
+  },
+  published: {
+    id: 'published',
+    defaultMessage: 'Published',
+  },
+  intranet: {
+    id: 'intranet',
+    defaultMessage: 'Intranet',
+  },
+  draft: {
+    id: 'draft',
+    defaultMessage: 'Draft',
+  },
+  no_workflow_state: {
+    id: 'no workflow state',
+    defaultMessage: 'No workflow state',
+  },
+  none: {
+    id: 'Not available',
+    defaultMessage: 'None',
+  },
+});
+
+function getColor(string) {
+  switch (string) {
+    case 'private':
+      return '#ed4033';
+    case 'published':
+      return '#007bc1';
+    case 'intranet':
+      return '#51aa55';
+    case 'draft':
+      return '#f6a808';
+    default:
+      return 'grey';
+  }
+}
+
+/**
+ * Contents item component class.
+ * @function ContentsItemComponent
+ * @returns {string} Markup of the component.
+ */
+export const ContentsItemComponent = ({
+  item,
+  selected,
+  onClick,
+  indexes,
+  onCut,
+  onCopy,
+  onDelete,
+  onMoveToTop,
+  onMoveToBottom,
+  connectDragPreview,
+  connectDragSource,
+  connectDropTarget,
+  isDragging,
+  order,
+}) => {
+  const intl = useIntl();
+  const now = Date.now();
+  const expirationTime = new Date(item.ExpirationDate).getTime();
+  const effectiveTime = new Date(item.EffectiveDate).getTime();
+  const isExpired = item.ExpirationDate !== 'None' && expirationTime < now;
+  const isScheduled = item.EffectiveDate !== 'None' && effectiveTime > now;
+
+  return connectDropTarget(
+    connectDragPreview(
+      <tr
+        key={item['@id']}
+        className={cx('', { 'dragging-row': isDragging })}
+        aria-label={item['@id']}
+      >
+        <Table.Cell className={cx('', { 'dragging-cell': isDragging })}>
+          {connectDragSource(
+            <div style={{ display: 'inline-block' }}>
+              <Button icon basic>
+                <Icon
+                  name={dragSVG}
+                  size="20px"
+                  color="#878f93"
+                  className="content drag handle"
+                />
+              </Button>
+            </div>,
+          )}
+        </Table.Cell>
+        <Table.Cell className={cx('', { 'dragging-cell': isDragging })}>
+          {selected ? (
+            <Button
+              icon
+              basic
+              aria-label="Unchecked"
+              onClick={(e) => onClick(e, item['@id'])}
+            >
+              <Icon
+                name={checkboxCheckedSVG}
+                color="#007eb1"
+                size="24px"
+                className="checked"
+              />
+            </Button>
+          ) : (
+            <Button
+              icon
+              basic
+              aria-label="Checked"
+              onClick={(e) => onClick(e, item['@id'])}
+            >
+              <Icon
+                name={checkboxUncheckedSVG}
+                color="#826a6a"
+                size="24px"
+                className="unchecked"
+              />
+            </Button>
+          )}
+        </Table.Cell>
+        <Table.Cell className={cx('', { 'dragging-cell': isDragging })}>
+          <Link
+            className="icon-align-name"
+            to={`${item['@id']}${item.is_folderish ? '/contents' : ''}`}
+          >
+            <div
+              className="expire-align"
+              style={{ flex: '1 1 auto', minWidth: 0 }}
+            >
+              <Icon
+                name={getContentIcon(item['@type'], item.is_folderish)}
+                size="20px"
+                className="icon-margin"
+                color="#878f93"
+                title={item['Type'] || item['@type']}
+              />{' '}
+              <span
+                title={item.title}
+                style={{ flex: '1 1 auto', minWidth: 0 }}
+              >
+                {' '}
+                {item.title}
+              </span>
+            </div>
+            {isExpired && (
+              <Button
+                className="button-margin"
+                size="mini"
+                style={{ flexShrink: 0 }}
+              >
+                <FormattedMessage id="Expired" defaultMessage="Expired" />
+              </Button>
+            )}
+            {isScheduled && (
+              <Button
+                className="button-margin effective-future"
+                size="mini"
+                style={{ flexShrink: 0 }}
+              >
+                <FormattedMessage id="Scheduled" defaultMessage="Scheduled" />
+              </Button>
+            )}
+          </Link>
+        </Table.Cell>
+        {map(indexes, (index) => (
+          <Table.Cell
+            className={cx('', { 'dragging-cell': isDragging })}
+            key={index.id}
+          >
+            {index.type === 'boolean' &&
+              (item[index.id] ? (
+                <FormattedMessage id="Yes" defaultMessage="Yes" />
+              ) : (
+                <FormattedMessage id="No" defaultMessage="No" />
+              ))}
+            {index.type === 'string' &&
+              index.id !== 'review_state' &&
+              item[index.id]}
+            {index.id === 'review_state' && (
+              <div>
+                <span>
+                  <Circle color={getColor(item[index.id])} size="15px" />
+                </span>
+                {messages[item[index.id]]
+                  ? intl.formatMessage(messages[item[index.id]])
+                  : item['review_title'] ||
+                    item['review_state'] ||
+                    intl.formatMessage(messages.no_workflow_state)}
+              </div>
+            )}
+            {index.type === 'date' && (
+              <>
+                {item[index?.id] && item[index.id] !== 'None' ? (
+                  <FormattedDate date={item[index.id]} />
+                ) : (
+                  intl.formatMessage(messages.none)
+                )}
+              </>
+            )}
+            {index.type === 'array' && (
+              <span>{item[index.id]?.join(', ')}</span>
+            )}
+          </Table.Cell>
+        ))}
+        <Table.Cell
+          className={cx('', { 'dragging-cell': isDragging })}
+          textAlign="right"
+        >
+          <Popup
+            menu={true}
+            position="bottom right"
+            flowing={true}
+            basic={true}
+            on="click"
+            popper={{
+              className: 'dropdown-popup',
+            }}
+            trigger={
+              <Icon
+                name={moreSVG}
+                className="dropdown-popup-trigger"
+                size="24px"
+                color="#007eb1"
+              />
+            }
+          >
+            <Menu vertical borderless fluid>
+              <Link className="item icon-align" to={`${item['@id']}/edit`}>
+                <Icon name={editingSVG} color="#007eb1" size="24px" />{' '}
+                <FormattedMessage id="Edit" defaultMessage="Edit" />
+              </Link>
+              <Link className="item right-dropdown icon-align" to={item['@id']}>
+                <Icon name={showSVG} color="#007eb1" size="24px" />{' '}
+                <FormattedMessage id="View" defaultMessage="View" />
+              </Link>
+              <Divider />
+              <Menu.Item
+                onClick={onCut}
+                value={item['@id']}
+                className="right-dropdown icon-align"
+              >
+                <Icon name={cutSVG} color="#007eb1" size="24px" />{' '}
+                <FormattedMessage id="Cut" defaultMessage="Cut" />
+              </Menu.Item>
+              <Menu.Item
+                onClick={onCopy}
+                value={item['@id']}
+                className="right-dropdown icon-align"
+              >
+                <Icon name={copySVG} color="#007eb1" size="24px" />{' '}
+                <FormattedMessage id="Copy" defaultMessage="Copy" />
+              </Menu.Item>
+              <Menu.Item
+                onClick={onDelete}
+                value={item['@id']}
+                className="right-dropdown icon-align"
+              >
+                <Icon name={deleteSVG} color="#e40166" size="24px" />{' '}
+                <FormattedMessage id="Delete" defaultMessage="Delete" />
+              </Menu.Item>
+              <Divider />
+              <Menu.Item
+                onClick={onMoveToTop}
+                value={order}
+                className="right-dropdown icon-align"
+              >
+                <Icon name={moveUpSVG} color="#007eb1" size="24px" />{' '}
+                <FormattedMessage
+                  id="Move to top of folder"
+                  defaultMessage="Move to top of folder"
+                />
+              </Menu.Item>
+              <Menu.Item
+                onClick={onMoveToBottom}
+                value={order}
+                className="right-dropdown icon-align"
+              >
+                <Icon name={moveDownSVG} color="#007eb1" size="24px" />{' '}
+                <FormattedMessage
+                  id="Move to bottom of folder"
+                  defaultMessage="Move to bottom of folder"
+                />
+              </Menu.Item>
+            </Menu>
+          </Popup>
+        </Table.Cell>
+      </tr>,
+    ),
+  );
+};
+
+/**
+ * Property types.
+ * @property {Object} propTypes Property types.
+ * @static
+ */
+ContentsItemComponent.propTypes = {
+  item: PropTypes.shape({
+    '@id': PropTypes.string,
+    title: PropTypes.string,
+    is_folderish: PropTypes.bool,
+    '@type': PropTypes.string,
+  }).isRequired,
+  selected: PropTypes.bool.isRequired,
+  onClick: PropTypes.func.isRequired,
+  indexes: PropTypes.arrayOf(
+    PropTypes.shape({
+      id: PropTypes.string,
+      type: PropTypes.string,
+    }),
+  ).isRequired,
+  onCut: PropTypes.func.isRequired,
+  onCopy: PropTypes.func.isRequired,
+  onDelete: PropTypes.func.isRequired,
+  onMoveToTop: PropTypes.func.isRequired,
+  onMoveToBottom: PropTypes.func.isRequired,
+  connectDragPreview: PropTypes.func.isRequired,
+  connectDragSource: PropTypes.func.isRequired,
+  connectDropTarget: PropTypes.func.isRequired,
+  isDragging: PropTypes.bool.isRequired,
+  order: PropTypes.number.isRequired,
+  onOrderItem: PropTypes.func.isRequired,
+};
+
+const DragDropConnector = (props) => {
+  const { DropTarget, DragSource } = props.reactDnd;
+
+  const DndConnectedContentsItem = React.useMemo(
+    () =>
+      DropTarget(
+        'item',
+        {
+          hover(props, monitor) {
+            const id = monitor.getItem().id;
+            const dragOrder = monitor.getItem().order;
+            const hoverOrder = props.order;
+
+            if (dragOrder === hoverOrder) {
+              return;
+            }
+
+            props.onOrderItem(id, dragOrder, hoverOrder - dragOrder, false);
+
+            monitor.getItem().order = hoverOrder;
+          },
+          drop(props, monitor) {
+            const id = monitor.getItem().id;
+            const dragOrder = monitor.getItem().startOrder;
+            const dropOrder = props.order;
+
+            if (dragOrder === dropOrder) {
+              return;
+            }
+
+            props.onOrderItem(id, dragOrder, dropOrder - dragOrder, true);
+
+            monitor.getItem().order = dropOrder;
+          },
+        },
+        (connect) => ({
+          connectDropTarget: connect.dropTarget(),
+        }),
+      )(
+        DragSource(
+          'item',
+          {
+            beginDrag(props) {
+              return {
+                id: props.item['@id'],
+                order: props.order,
+                startOrder: props.order,
+              };
+            },
+          },
+          (connect, monitor) => ({
+            connectDragSource: connect.dragSource(),
+            connectDragPreview: connect.dragPreview(),
+            isDragging: monitor.isDragging(),
+          }),
+        )(ContentsItemComponent),
+      ),
+    [DragSource, DropTarget],
+  );
+
+  return <DndConnectedContentsItem {...props} />;
+};
+
+export default injectLazyLibs('reactDnd')(DragDropConnector);

package/src/customizations/volto/components/manage/Contents/ContentsItem.jsx.diff

@@ -0,0 +1,73 @@
+--- node_modules/@plone/volto/src/components/manage/Contents/ContentsItem.jsx
++++ src/customizations/volto/components/manage/Contents/ContentsItem.jsx
+@@ -97,6 +97,11 @@
+   order,
+ }) => {
+   const intl = useIntl();
++  const now = Date.now();
++  const expirationTime = new Date(item.ExpirationDate).getTime();
++  const effectiveTime = new Date(item.EffectiveDate).getTime();
++  const isExpired = item.ExpirationDate !== 'None' && expirationTime < now;
++  const isScheduled = item.EffectiveDate !== 'None' && effectiveTime > now;
+ 
+   return connectDropTarget(
+     connectDragPreview(
+@@ -155,7 +160,10 @@
+             className="icon-align-name"
+             to={`${item['@id']}${item.is_folderish ? '/contents' : ''}`}
+           >
+-            <div className="expire-align">
++            <div
++              className="expire-align"
++              style={{ flex: '1 1 auto', minWidth: 0 }}
++            >
+               <Icon
+                 name={getContentIcon(item['@type'], item.is_folderish)}
+                 size="20px"
+@@ -163,21 +171,32 @@
+                 color="#878f93"
+                 title={item['Type'] || item['@type']}
+               />{' '}
+-              <span title={item.title}> {item.title}</span>
++              <span
++                title={item.title}
++                style={{ flex: '1 1 auto', minWidth: 0 }}
++              >
++                {' '}
++                {item.title}
++              </span>
+             </div>
+-            {item.ExpirationDate !== 'None' &&
+-              new Date(item.ExpirationDate).getTime() <
+-                new Date().getTime() && (
+-                <Button className="button-margin" size="mini">
+-                  <FormattedMessage id="Expired" defaultMessage="Expired" />
+-                </Button>
+-              )}
+-            {item.EffectiveDate !== 'None' &&
+-              new Date(item.EffectiveDate).getTime() > new Date().getTime() && (
+-                <Button className="button-margin effective-future" size="mini">
+-                  <FormattedMessage id="Scheduled" defaultMessage="Scheduled" />
+-                </Button>
+-              )}
++            {isExpired && (
++              <Button
++                className="button-margin"
++                size="mini"
++                style={{ flexShrink: 0 }}
++              >
++                <FormattedMessage id="Expired" defaultMessage="Expired" />
++              </Button>
++            )}
++            {isScheduled && (
++              <Button
++                className="button-margin effective-future"
++                size="mini"
++                style={{ flexShrink: 0 }}
++              >
++                <FormattedMessage id="Scheduled" defaultMessage="Scheduled" />
++              </Button>
++            )}
+           </Link>
+         </Table.Cell>
+         {map(indexes, (index) => (

package/src/customizations/volto/components/manage/Contents/ContentsItem.jsx.md

@@ -0,0 +1,19 @@
+# ContentsItem.jsx customization
+
+This customization shadows Volto core's
+`src/components/manage/Contents/ContentsItem.jsx` from `@plone/volto` 18.33.1.
+
+The functional changes are limited to the contents table item link:
+
+- The expired and scheduled date checks are computed once per render as
+  `isExpired` and `isScheduled`, then reused by the badge rendering.
+- The title wrapper and title text are allowed to shrink with flexbox
+  (`flex: '1 1 auto'` and `minWidth: 0`), while the status badges keep their
+  intrinsic width with `flexShrink: 0`.
+
+The goal is to avoid title text colliding with the `Expired` or `Scheduled`
+badges without hardcoding a pixel width for the title.
+
+When upgrading Volto, compare the new core component with this override and
+refresh `ContentsItem.jsx.diff` if upstream changed around the contents item
+title or badge rendering.

package/src/customizations/volto/components/theme/Header/Header.jsx

@@ -3,26 +3,24 @@
  * @module components/theme/Header/Header
  */
 
-import React from 'react';
-import { Dropdown, Image } from 'semantic-ui-react';
+import loadable from '@loadable/component';
+import cx from 'classnames';
+import { useEffect, useMemo, useRef } from 'react';
 import { connect, useDispatch, useSelector } from 'react-redux';
-
 import { withRouter } from 'react-router-dom';
+import { compose } from 'redux';
+import { Dropdown, Image } from 'semantic-ui-react';
+
+import { getNavigation } from '@plone/volto/actions/navigation/navigation';
 import UniversalLink from '@plone/volto/components/manage/UniversalLink/UniversalLink';
 import { getBaseUrl } from '@plone/volto/helpers/Url/Url';
 import { hasApiExpander } from '@plone/volto/helpers/Utils/Utils';
-import { getNavigation } from '@plone/volto/actions/navigation/navigation';
-import { getNavigationSettings } from '@eeacms/volto-eea-website-theme/actions';
-import Header from '@eeacms/volto-eea-design-system/ui/Header/Header';
-import EEALogo from '@eeacms/volto-eea-website-theme/components/theme/Logo';
-import { usePrevious } from '@eeacms/volto-eea-design-system/helpers';
-import eeaFlag from '@eeacms/volto-eea-design-system/../theme/themes/eea/assets/images/Header/eea.png';
-
 import config from '@plone/volto/registry';
-import { compose } from 'redux';
 
-import cx from 'classnames';
-import loadable from '@loadable/component';
+import eeaFlag from '@eeacms/volto-eea-design-system/../theme/themes/eea/assets/images/Header/eea.png';
+import Header from '@eeacms/volto-eea-design-system/ui/Header/Header';
+import { getNavigationSettings } from '@eeacms/volto-eea-website-theme/actions';
+import EEALogo from '@eeacms/volto-eea-website-theme/components/theme/Logo';
 
 const LazyLanguageSwitcher = loadable(() => import('./LanguageSwitcher'));
 const EMPTY_NAVIGATION_SETTINGS = {};
@@ -32,15 +30,79 @@ function removeTrailingSlash(path) {
 }
 
 /**
- * EEA Specific Header component.
+ * Merge backend navigation settings into the config-level menu layouts.
  */
-const EEAHeader = ({ pathname, token, items, history, subsite }) => {
-  const router_pathname = useSelector((state) => {
-    return removeTrailingSlash(state.router?.location?.pathname) || '';
+function buildEnhancedLayouts(items, navigationSettings) {
+  const configLayouts = config.settings?.menuItemsLayouts || {};
+  const enhancedLayouts = { ...configLayouts };
+
+  if (!items) return enhancedLayouts;
+
+  items.forEach(() => {
+    Object.keys(navigationSettings).forEach((routeId) => {
+      const route = navigationSettings[routeId];
+      const backendSettings = {};
+
+      if (route.hideChildrenFromNavigation !== undefined) {
+        backendSettings.hideChildrenFromNavigation =
+          route.hideChildrenFromNavigation;
+      }
+
+      if (route.menuItemChildrenListColumns !== undefined) {
+        backendSettings.menuItemChildrenListColumns = Array.isArray(
+          route.menuItemChildrenListColumns,
+        )
+          ? route.menuItemChildrenListColumns
+              .map((val) => (typeof val === 'string' ? parseInt(val, 10) : val))
+              .filter((val) => !isNaN(val))
+          : route.menuItemChildrenListColumns;
+      }
+
+      if (route.menuItemColumns !== undefined) {
+        backendSettings.menuItemColumns = route.menuItemColumns;
+      }
+
+      if (Object.keys(backendSettings).length > 0) {
+        enhancedLayouts[routeId] = {
+          ...enhancedLayouts[routeId],
+          ...backendSettings,
+        };
+      }
+    });
   });
 
+  return enhancedLayouts;
+}
+
+/**
+ * EEA Specific Header component.
+ */
+const EEAHeader = ({ pathname, token, items, history, navroot, subsite }) => {
+  // Config / static derived values
+  const { eea } = config.settings;
+  const headerOpts = eea.headerOpts || {};
+  const { logo, logoWhite } = headerOpts;
+
   const isSubsite = subsite?.['@type'] === 'Subsite';
 
+  // Redux state
+  const dispatch = useDispatch();
+  const width = useSelector((state) => state.screen?.width);
+
+  const router_pathname = useSelector(
+    (state) => removeTrailingSlash(state.router?.location?.pathname) || '',
+  );
+
+  const headerSettings = useSelector(
+    (state) => state.reduxAsyncConnect?.headerSettings,
+  );
+
+  const navigationSettings =
+    useSelector((state) => state.navigationSettings?.settings) ||
+    EMPTY_NAVIGATION_SETTINGS;
+
+  const updateRequest = useSelector((state) => state.content.update);
+
   const isHomePageInverse = useSelector((state) => {
     const layout = state.content?.data?.layout;
     const has_home_layout =
@@ -55,85 +117,69 @@ const EEAHeader = ({ pathname, token, items, history, subsite }) => {
     );
   });
 
-  const { eea } = config.settings;
-  const headerOpts = eea.headerOpts || {};
-  const { logo, logoWhite } = headerOpts;
-  const width = useSelector((state) => state.screen?.width);
-  const dispatch = useDispatch();
-
-  const headerSettings = useSelector(
-    (state) => state.reduxAsyncConnect?.headerSettings,
-  );
+  const prevTokenRef = useRef(undefined);
 
+  // Derived / memoized values
   const headerSearchBox =
     headerSettings?.searchBox || eea.headerSearchBox || [];
-  const previousToken = usePrevious(token);
-  const navigationSettings =
-    useSelector((state) => state.navigationSettings?.settings) ||
-    EMPTY_NAVIGATION_SETTINGS;
-  const updateRequest = useSelector((state) => state.content.update);
-
-  // Combine navigation settings from backend with config fallback
-  const configLayouts = config.settings?.menuItemsLayouts || {};
-  const enhancedLayouts = { ...configLayouts };
 
-  // Map navigation settings to menu item URLs
-  if (items) {
-    items.forEach((menuItem) => {
-      // Check if we have navigation settings for any route that might match this menu item
-      Object.keys(navigationSettings).forEach((routeId) => {
-        const route = navigationSettings[routeId];
-        const backendSettings = {};
-
-        if (route.hideChildrenFromNavigation !== undefined) {
-          backendSettings.hideChildrenFromNavigation =
-            route.hideChildrenFromNavigation;
-        }
+  const enhancedLayouts = buildEnhancedLayouts(items, navigationSettings);
+
+  // Prefer navroot.language; fall back to extracting language from pathname
+  // (validated against supportedLanguages) when navroot is not yet loaded.
+  const navrootLang = useMemo(() => {
+    const { supportedLanguages, navigationLanguage } = config.settings;
+    if (navroot?.language?.token) return navroot.language.token;
+    const supported = supportedLanguages || [];
+    const first = pathname.split('/').filter(Boolean)[0];
+    if (first === undefined) return navigationLanguage || null;
+    return supported.includes(first) ? first : null;
+  }, [navroot, pathname]);
+
+  // Normalize pathname for menu active-item matching when using
+  // navigationLanguage. Menu items come from the configured language; rewrite
+  // the current language prefix to match. E.g. navLang='en' on /fr/topics ->
+  // /en/topics. Uses navroot.language as source of truth instead of parsing
+  // the first path segment.
+  const normalizedPathname = useMemo(() => {
+    const navLang = config.settings.navigationLanguage;
+    if (!navLang || !navrootLang || navrootLang === navLang) return pathname;
 
-        if (route.menuItemChildrenListColumns !== undefined) {
-          // Convert strings back to integers for header usage
-          backendSettings.menuItemChildrenListColumns = Array.isArray(
-            route.menuItemChildrenListColumns,
-          )
-            ? route.menuItemChildrenListColumns
-                .map((val) =>
-                  typeof val === 'string' ? parseInt(val, 10) : val,
-                )
-                .filter((val) => !isNaN(val))
-            : route.menuItemChildrenListColumns;
-        }
+    const prefix = `/${navrootLang}`;
+    if (pathname === prefix) return `/${navLang}`;
+    if (pathname.startsWith(`${prefix}/`)) {
+      return `/${navLang}${pathname.slice(prefix.length)}`;
+    }
+    return pathname;
+  }, [pathname, navrootLang]);
 
-        if (route.menuItemColumns !== undefined) {
-          // Use menuItemColumns directly as they're already in semantic UI format
-          backendSettings.menuItemColumns = route.menuItemColumns;
-        }
+  const baseUrl = useMemo(() => {
+    const { settings } = config;
+    const navLang = settings.navigationLanguage;
+    let url = getBaseUrl(pathname);
 
-        if (Object.keys(backendSettings).length > 0) {
-          // Override the config setting with backend data
-          enhancedLayouts[routeId] = {
-            ...enhancedLayouts[routeId],
-            ...backendSettings,
-          };
-        }
-      });
-    });
-  }
+    if (isSubsite || !navLang || !navrootLang) {
+      return url;
+    }
 
-  // Memoize navigationBaseUrl so it doesn't change on every pathname change
-  // when navigationLanguage is set to a fixed language
-  const navigationBaseUrl = React.useMemo(() => {
-    const { settings } = config;
-    return settings.navigationLanguage
-      ? `/${settings.navigationLanguage}`
-      : getBaseUrl(pathname);
-  }, [pathname]);
+    // When the current navroot's language differs from the configured
+    // navigationLanguage, override the base url so navigation is fetched from
+    // the configured language root instead of the current navroot.
+    if (navLang !== navrootLang) {
+      url = `/${settings.navigationLanguage}`;
+    } else if (!url && navLang === navrootLang) {
+      url = `/${navLang}`;
+    }
+    return url;
+  }, [pathname, navrootLang, isSubsite]);
 
-  React.useEffect(() => {
+  // Fetch navigation settings on pathname change.
+  useEffect(() => {
     dispatch(getNavigationSettings(pathname));
   }, [dispatch, pathname]);
 
-  // Separate effect for update request to avoid duplicate calls
-  React.useEffect(() => {
+  // Re-fetch navigation settings after a content update for the current page.
+  useEffect(() => {
     if (
       updateRequest?.loaded &&
       removeTrailingSlash(updateRequest?.content?.['@id'] || '') ===
@@ -143,46 +189,36 @@ const EEAHeader = ({ pathname, token, items, history, subsite }) => {
     }
   }, [updateRequest, dispatch, pathname]);
 
-  React.useEffect(() => {
+  // Fetch the main navigation tree.
+  // Cases that force a fetch:
+  //   1. Language mismatch — the current navroot's language differs from the
+  //      configured navigationLanguage, so the API expander's navigation (if
+  //      any) is in the wrong language and must be replaced.
+  //   2. Token change — auth state affects which nav items are visible, so
+  //      expander data loaded under the previous token may be stale.
+  //   3. No expander available — backend did not pre-supply navigation for
+  //      this base url, so we fetch it explicitly.
+  // Otherwise the expander already supplied correct navigation; no fetch.
+  useEffect(() => {
     const { settings } = config;
+    const navLang = settings.navigationLanguage;
+    const langMismatch = navLang && navrootLang && navrootLang !== navLang;
+    const tokenChanged = prevTokenRef.current !== token;
 
-    // When navigationLanguage is configured, always fetch navigation from that language
-    // We MUST call getNavigation directly because API expanders fetch navigation for the current page
-    if (settings.navigationLanguage) {
-      // Always fetch navigation for the configured language
-      dispatch(getNavigation(navigationBaseUrl, settings.navDepth));
-    } else {
-      // When navigationLanguage is not configured, fetch navigation for current page language
-      // Check if navigation data needs to be fetched based on the API expander availability
-      if (!hasApiExpander('navigation', navigationBaseUrl)) {
-        dispatch(getNavigation(navigationBaseUrl, settings.navDepth));
-      }
-
-      // Additional check for token changes
-      if (token !== previousToken) {
-        dispatch(getNavigation(navigationBaseUrl, settings.navDepth));
-      }
-    }
-  }, [navigationBaseUrl, token, dispatch, previousToken]);
-
-  // Normalize pathname for menu matching when using navigationLanguage
-  // This ensures menu items from the configured language match correctly even when on other language pages
-  const normalizedPathname = React.useMemo(() => {
-    const navLang = config.settings.navigationLanguage;
-    if (!navLang) {
-      return pathname;
+    if (
+      langMismatch ||
+      tokenChanged ||
+      !hasApiExpander('navigation', baseUrl)
+    ) {
+      dispatch(getNavigation(baseUrl, settings.navDepth));
     }
+  }, [dispatch, baseUrl, navrootLang, token]);
 
-    // Replace the language prefix with the configured navigation language for menu matching
-    // e.g., if navLang='en': /fr/topics -> /en/topics
-    const pathParts = pathname.split('/').filter(Boolean);
-    if (pathParts.length > 0 && pathParts[0].length === 2) {
-      // First segment is a language code, replace it with the navigation language
-      const rest = pathParts.slice(1).join('/');
-      return rest ? `/${navLang}/${rest}` : `/${navLang}`;
-    }
-    return pathname;
-  }, [pathname]);
+  // Track the previous token value. Runs after the fetch effect so the
+  // comparison above sees the value from the prior render.
+  useEffect(() => {
+    prevTokenRef.current = token;
+  }, [token]);
 
   return (
     <Header menuItems={items}>
@@ -327,6 +363,7 @@ export default compose(
     (state) => ({
       token: state.userSession.token,
       items: state.navigation.items,
+      navroot: state.content.data?.['@components']?.navroot?.navroot,
       subsite: state.content.data?.['@components']?.subsite,
     }),
     { getNavigation },