@eeacms/volto-eea-website-theme 3.5.5 → 3.6.0

package/src/customizations/volto/actions/vocabularies/vocabularies.test.js

@@ -0,0 +1,57 @@
+import { getVocabulary } from './vocabularies';
+import { GET_VOCABULARY } from '@plone/volto/constants/ActionTypes';
+
+describe('Vocabularies actions', () => {
+  describe('getVocabulary', () => {
+    it('should create an action to get a vocabulary', () => {
+      const vocabNameOrURL = 'plone.app.vocabularies.Keywords';
+      const query = 'john';
+      const action = getVocabulary({ vocabNameOrURL, query });
+
+      expect(action.type).toEqual(GET_VOCABULARY);
+      expect(action.vocabulary).toEqual(vocabNameOrURL);
+      expect(action.request.op).toEqual('get');
+      expect(action.request.path).toEqual(
+        `/@vocabularies/${vocabNameOrURL}?b_start=0&title=${query}`,
+      );
+    });
+    it('should create an action to get a vocabulary if a URL is passed', () => {
+      const vocabNameOrURL =
+        'http://localhost:3000/@vocabularies/plone.app.vocabularies.Keywords';
+      const query = 'john';
+      const action = getVocabulary({ vocabNameOrURL, query });
+
+      expect(action.type).toEqual(GET_VOCABULARY);
+      expect(action.vocabulary).toEqual(vocabNameOrURL);
+      expect(action.request.op).toEqual('get');
+      expect(action.request.path).toEqual(
+        `/@vocabularies/plone.app.vocabularies.Keywords?b_start=0&title=${query}`,
+      );
+    });
+    it('should create an action to get a vocabulary if a URL with path is passed', () => {
+      const vocabNameOrURL =
+        'http://localhost:3000/de/foo/bar/@vocabularies/plone.app.vocabularies.Keywords';
+      const query = 'john';
+      const action = getVocabulary({ vocabNameOrURL, query });
+
+      expect(action.type).toEqual(GET_VOCABULARY);
+      expect(action.vocabulary).toEqual(vocabNameOrURL);
+      expect(action.request.op).toEqual('get');
+      expect(action.request.path).toEqual(
+        `/de/foo/bar/@vocabularies/plone.app.vocabularies.Keywords?b_start=0&title=${query}`,
+      );
+    });
+    it('should create an action to get a vocabulary if an b_size=-1 is passed', () => {
+      const vocabNameOrURL =
+        'http://localhost:3000/de/foo/bar/@vocabularies/plone.app.vocabularies.Keywords';
+      const action = getVocabulary({ vocabNameOrURL, size: -1 });
+
+      expect(action.type).toEqual(GET_VOCABULARY);
+      expect(action.vocabulary).toEqual(vocabNameOrURL);
+      expect(action.request.op).toEqual('get');
+      expect(action.request.path).toEqual(
+        `/de/foo/bar/@vocabularies/plone.app.vocabularies.Keywords?b_start=0&b_size=-1`,
+      );
+    });
+  });
+});

package/src/customizations/volto/actions/vocabularies/vocabularies.test.js.diff

@@ -0,0 +1,45 @@
+diff --git a/src/customizations/volto/actions/vocabularies/vocabularies.test.js b/src/customizations/volto/actions/vocabularies/vocabularies.test.js
+index b7deafc..ca4fc8a 100644
+--- a/src/customizations/volto/actions/vocabularies/vocabularies.test.js
++++ b/src/customizations/volto/actions/vocabularies/vocabularies.test.js
+@@ -17,7 +17,7 @@ describe('Vocabularies actions', () => {
+     });
+     it('should create an action to get a vocabulary if a URL is passed', () => {
+       const vocabNameOrURL =
+-        'http://localhost:8080/@vocabularies/plone.app.vocabularies.Keywords';
++        'http://localhost:3000/@vocabularies/plone.app.vocabularies.Keywords';
+       const query = 'john';
+       const action = getVocabulary({ vocabNameOrURL, query });
+
+@@ -30,7 +30,7 @@ describe('Vocabularies actions', () => {
+     });
+     it('should create an action to get a vocabulary if a URL with path is passed', () => {
+       const vocabNameOrURL =
+-        'http://localhost:8080/de/foo/bar/@vocabularies/plone.app.vocabularies.Keywords';
++        'http://localhost:3000/de/foo/bar/@vocabularies/plone.app.vocabularies.Keywords';
+       const query = 'john';
+       const action = getVocabulary({ vocabNameOrURL, query });
+
+@@ -38,19 +38,19 @@ describe('Vocabularies actions', () => {
+       expect(action.vocabulary).toEqual(vocabNameOrURL);
+       expect(action.request.op).toEqual('get');
+       expect(action.request.path).toEqual(
+-        `/@vocabularies/plone.app.vocabularies.Keywords?b_start=0&title=${query}`,
++        `/de/foo/bar/@vocabularies/plone.app.vocabularies.Keywords?b_start=0&title=${query}`,
+       );
+     });
+     it('should create an action to get a vocabulary if an b_size=-1 is passed', () => {
+       const vocabNameOrURL =
+-        'http://localhost:8080/de/foo/bar/@vocabularies/plone.app.vocabularies.Keywords';
++        'http://localhost:3000/de/foo/bar/@vocabularies/plone.app.vocabularies.Keywords';
+       const action = getVocabulary({ vocabNameOrURL, size: -1 });
+
+       expect(action.type).toEqual(GET_VOCABULARY);
+       expect(action.vocabulary).toEqual(vocabNameOrURL);
+       expect(action.request.op).toEqual('get');
+       expect(action.request.path).toEqual(
+-        `/@vocabularies/plone.app.vocabularies.Keywords?b_start=0&b_size=-1`,
++        `/de/foo/bar/@vocabularies/plone.app.vocabularies.Keywords?b_start=0&b_size=-1`,
+       );
+     });
+   });

package/src/hocs/withRootNavigation.test.jsx

@@ -0,0 +1,70 @@
+import React from 'react';
+import { Provider } from 'react-redux';
+import configureStore from 'redux-mock-store';
+import thunk from 'redux-thunk'; // ✅ Add redux-thunk middleware
+import { render } from '@testing-library/react';
+import withRootNavigation from './withRootNavigation';
+import { getNavigation } from '@plone/volto/actions';
+import { getBaseUrl, hasApiExpander } from '@plone/volto/helpers';
+import config from '@plone/volto/registry';
+
+// Mock dependencies
+jest.mock('@plone/volto/actions', () => ({
+  getNavigation: jest.fn(() => ({ type: 'GET_NAVIGATION' })), // ✅ Ensure it returns a plain object
+}));
+jest.mock('@plone/volto/helpers', () => ({
+  getBaseUrl: jest.fn(() => '/en'),
+  hasApiExpander: jest.fn(() => false),
+}));
+jest.mock('@plone/volto/registry', () => ({
+  settings: { navDepth: 2 },
+}));
+
+// ✅ Use redux-thunk middleware
+const mockStore = configureStore([thunk]); // Add thunk to support async actions
+
+const initialState = {
+  navigation: { items: [{ title: 'Home', url: '/' }] },
+  intl: { locale: 'en' },
+};
+
+const store = mockStore(initialState);
+
+// Mock Wrapped Component
+const MockComponent = (props) => {
+  return (
+    <div data-testid="wrapped-component">{JSON.stringify(props.items)}</div>
+  );
+};
+
+const WrappedComponent = withRootNavigation(MockComponent);
+
+describe('withRootNavigation HOC', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  test('calls getNavigation when API expander is not set', () => {
+    render(
+      <Provider store={store}>
+        <WrappedComponent />
+      </Provider>,
+    );
+
+    expect(getBaseUrl).toHaveBeenCalledWith('/en'); // Check base URL calculation
+    expect(hasApiExpander).toHaveBeenCalledWith('navigation', '/en'); // Ensure API expander is checked
+    expect(getNavigation).toHaveBeenCalledWith('/en', config.settings.navDepth); // Ensure getNavigation is dispatched
+  });
+
+  test('does not call getNavigation if API expander is already set', () => {
+    hasApiExpander.mockReturnValue(true); // Simulate that API expander is already set
+
+    render(
+      <Provider store={store}>
+        <WrappedComponent />
+      </Provider>,
+    );
+
+    expect(getNavigation).not.toHaveBeenCalled(); // Ensure getNavigation is NOT called
+  });
+});

package/src/index.js

@@ -2,7 +2,6 @@ import React from 'react';
 import { v4 as uuid } from 'uuid';
 import { Icon } from '@plone/volto/components';
 import { default as TokenWidgetEdit } from '@plone/volto/components/manage/Widgets/TokenWidget';
-import SelectAutoCompleteWidget from '@plone/volto/components/manage/Widgets/SelectAutoComplete';
 import { serializeNodesToText } from '@plone/volto-slate/editor/render';
 import TableBlockEdit from '@plone/volto-slate/blocks/Table/TableBlockEdit';
 import TableBlockView from '@plone/volto-slate/blocks/Table/TableBlockView';
@@ -20,7 +19,10 @@ import { TopicsWidget } from '@eeacms/volto-eea-website-theme/components/theme/W
 import { DateWidget } from '@eeacms/volto-eea-website-theme/components/theme/Widgets/DateWidget';
 import { DatetimeWidget } from '@eeacms/volto-eea-website-theme/components/theme/Widgets/DatetimeWidget';
 import CreatableSelectWidget from '@eeacms/volto-eea-website-theme/components/theme/Widgets/CreatableSelectWidget';
+import UserSelectWidget from '@eeacms/volto-eea-website-theme/components/theme/Widgets/UserSelectWidget';
 import ImageViewWidget from '@eeacms/volto-eea-website-theme/components/theme/Widgets/ImageViewWidget';
+import CreatorsViewWidget from '@eeacms/volto-eea-website-theme/components/theme/Widgets/CreatorsViewWidget';
+import ContributorsViewWidget from '@eeacms/volto-eea-website-theme/components/theme/Widgets/ContributorsViewWidget';
 
 import Tag from '@eeacms/volto-eea-design-system/ui/Tag/Tag';
 
@@ -371,9 +373,12 @@ const applyConfig = (config) => {
   config.widgets.views.id.topics = TopicsWidget;
   config.widgets.views.id.subjects = TokenWidget;
   config.widgets.views.widget.tags = TokenWidget;
+  config.widgets.views.id.creators = CreatorsViewWidget;
+  config.widgets.views.id.contributors = ContributorsViewWidget;
+  config.widgets.views.widget.contributors = ContributorsViewWidget;
+  config.widgets.views.widget.creators = CreatorsViewWidget;
   config.widgets.widget.creatable_select = CreatableSelectWidget;
-  config.widgets.vocabulary['plone.app.vocabularies.Users'] =
-    SelectAutoCompleteWidget;
+  config.widgets.vocabulary['plone.app.vocabularies.Users'] = UserSelectWidget;
 
   config.widgets.views.factory = {
     ...(config.widgets.views.factory || {}),