@eeacms/volto-marine-policy 1.1.17 → 2.0.0

package/CHANGELOG.md

@@ -4,6 +4,49 @@ 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).
 
+### [2.0.0](https://github.com/eea/volto-marine-policy/compare/1.1.18...2.0.0) - 19 July 2024
+
+#### :bug: Bug Fixes
+
+- fix: minor fix [nileshgulia1 - [`7310c64`](https://github.com/eea/volto-marine-policy/commit/7310c646894d62b947b5f4a72d7ffcc42bbca9f2)]
+- fix: add tests [nileshgulia1 - [`bcc22da`](https://github.com/eea/volto-marine-policy/commit/bcc22da492ed02e506f2f2b0c0f9f71567429459)]
+- fix: update env vars for elastic_index [nileshgulia1 - [`704e9bf`](https://github.com/eea/volto-marine-policy/commit/704e9bf97190592ed3e03cf97c45e5568a03392c)]
+- fix: add a custom theme widget for sub-theme refs#270459 [nileshgulia1 - [`cb9689b`](https://github.com/eea/volto-marine-policy/commit/cb9689b8ea430b80c04d4fe4ecff6d3b23818da5)]
+
+#### :house: Internal changes
+
+- chore(jenkins): test only with CI [nileshgulia1 - [`f79e5e8`](https://github.com/eea/volto-marine-policy/commit/f79e5e876541b42ae9b00ebcedef67eca1e25bc6)]
+- chore:cleanup [nileshgulia1 - [`8ff1fec`](https://github.com/eea/volto-marine-policy/commit/8ff1fecfd6a1cbe484dfdababe155cb2d6cba7fb)]
+- chore: remove d3-array resolutions [nileshgulia1 - [`94b8d35`](https://github.com/eea/volto-marine-policy/commit/94b8d358cf0f1265467af2e1e175b5091c2f70ee)]
+- chore: pin addons to latest versions [nileshgulia1 - [`4a44533`](https://github.com/eea/volto-marine-policy/commit/4a44533b2b8a3be810b1cb13c68b9365ad80b457)]
+- style: Automated code fix [eea-jenkins - [`79dd9e3`](https://github.com/eea/volto-marine-policy/commit/79dd9e32bcd1c0e16069b3d433047a2e4e9df415)]
+- style: Automated code fix [eea-jenkins - [`e6e107d`](https://github.com/eea/volto-marine-policy/commit/e6e107d25a6262704411146b096ae7e2230c5a27)]
+
+#### :hammer_and_wrench: Others
+
+- pin volto-searchlib to 2.0.2 [nileshgulia1 - [`f08b01f`](https://github.com/eea/volto-marine-policy/commit/f08b01fb751eb64bdf2bb4ea9bd73a049ac475c9)]
+- bump version [nileshgulia1 - [`6853ecd`](https://github.com/eea/volto-marine-policy/commit/6853ecdfcb7cbb78b57839047b8a638d1061f2d1)]
+- make sonaqqube happy [nileshgulia1 - [`d4b52ff`](https://github.com/eea/volto-marine-policy/commit/d4b52ff4c57d233587f03b4f06d77eb906e47aaf)]
+- pin   d3-array": ^2.12.1 [nileshgulia1 - [`3ad72f8`](https://github.com/eea/volto-marine-policy/commit/3ad72f8652ef4e7e07f4824a9b5201d12f47a797)]
+- update [nileshgulia1 - [`0c463f1`](https://github.com/eea/volto-marine-policy/commit/0c463f17b677130f91bb8dc6520c4f810fb60668)]
+- update package.json with res [nileshgulia1 - [`015fd27`](https://github.com/eea/volto-marine-policy/commit/015fd27d2af44ac597e7859d34e4f17eb55de519)]
+- update package.json [nileshgulia1 - [`d4cfbe9`](https://github.com/eea/volto-marine-policy/commit/d4cfbe91ec1e80b595e30559a2fee1a138b6d41f)]
+- test:update [nileshgulia1 - [`61ed93a`](https://github.com/eea/volto-marine-policy/commit/61ed93abcff8a46f356c16d4e532bf8eac42cebb)]
+- update [nileshgulia1 - [`c60cd26`](https://github.com/eea/volto-marine-policy/commit/c60cd26d19f0c5258207ac72213bad4cf8cf4da3)]
+- update [nileshgulia1 - [`cf8895d`](https://github.com/eea/volto-marine-policy/commit/cf8895dc7839a82ff2967e6c0fc876b225080181)]
+- pin addons to volto 17 compatible [nileshgulia1 - [`c054d6b`](https://github.com/eea/volto-marine-policy/commit/c054d6b8cc173d61b7ca52cb5143fb574b7a5e86)]
+- few more tests [nileshgulia1 - [`b593f51`](https://github.com/eea/volto-marine-policy/commit/b593f5166f3a135afbc45371e40d8e7f191535d8)]
+- fix customizations [nileshgulia1 - [`7428e73`](https://github.com/eea/volto-marine-policy/commit/7428e73c6fbaad9099f5959760d77be0b1f39429)]
+- make logo also inverse on /marine/ [nileshgulia1 - [`8348ed6`](https://github.com/eea/volto-marine-policy/commit/8348ed618838265f6708da2acbd9ae9220ee2454)]
+- remove volto-17 specific customiations that are needed for prefix-path as well [nileshgulia1 - [`7586b7c`](https://github.com/eea/volto-marine-policy/commit/7586b7cccecb59044cefbb6d9ce3ea602505f208)]
+- test: add unit tests [ana-oprea - [`4a55e1d`](https://github.com/eea/volto-marine-policy/commit/4a55e1d2cda27a8bc75fe120093fa591d426d93b)]
+- test: fix eslint errors and add unit tests [ana-oprea - [`0ce996b`](https://github.com/eea/volto-marine-policy/commit/0ce996bd32e89e8540f1626b712b7c59451a428b)]
+### [1.1.18](https://github.com/eea/volto-marine-policy/compare/1.1.17...1.1.18) - 11 July 2024
+
+#### :bug: Bug Fixes
+
+- fix: remove /policy-and-reporting from externalRoutes [laszlocseh - [`36c2887`](https://github.com/eea/volto-marine-policy/commit/36c2887d738ac81c615a18bbdea2d5ed3dc66eb1)]
+
 ### [1.1.17](https://github.com/eea/volto-marine-policy/compare/1.1.16...1.1.17) - 10 July 2024
 
 #### :bug: Bug Fixes

package/babel.config.js

@@ -2,6 +2,7 @@ module.exports = function (api) {
   api.cache(true);
   const presets = ['razzle'];
   const plugins = [
+    '@babel/plugin-proposal-export-default-from',
     [
       'react-intl', // React Intl extractor, required for the whole i18n infrastructure to work
       {

package/jest-addon.config.js

@@ -8,14 +8,18 @@ module.exports = {
   ],
   moduleNameMapper: {
     '\\.(css|less|scss|sass)$': 'identity-obj-proxy',
+    '@plone-collective/volto-authomatic/(.*)$':
+      '<rootDir>/node_modules/@plone-collective/volto-authomatic/src/$1',
     '@plone/volto/cypress': '<rootDir>/node_modules/@plone/volto/cypress',
     '@plone/volto/babel': '<rootDir>/node_modules/@plone/volto/babel',
     '@plone/volto/(.*)$': '<rootDir>/node_modules/@plone/volto/src/$1',
     '@package/(.*)$': '<rootDir>/node_modules/@plone/volto/src/$1',
     '@root/(.*)$': '<rootDir>/node_modules/@plone/volto/src/$1',
     '@plone/volto-quanta/(.*)$': '<rootDir>/src/addons/volto-quanta/src/$1',
-    '@eeacms/search/(.*)$': '<rootDir>/src/addons/volto-searchlib/searchlib/$1',
-    '@eeacms/search': '<rootDir>/src/addons/volto-searchlib/searchlib',
+    '@eeacms/search/(.*)$':
+      '<rootDir>/node_modules/@eeacms/volto-searchlib/searchlib/$1',
+    '@eeacms/search':
+      '<rootDir>/node_modules/@eeacms/volto-searchlib/searchlib',
     '@eeacms/(.*?)/(.*)$': '<rootDir>/node_modules/@eeacms/$1/src/$2',
     '@plone/volto-slate$':
       '<rootDir>/node_modules/@plone/volto/packages/volto-slate/src',
@@ -26,25 +30,26 @@ module.exports = {
       '<rootDir>/node_modules/@plone/volto/jest-addons-loader.js',
   },
   transformIgnorePatterns: [
-    '/node_modules/(?!(@plone|@root|@package|@eeacms)/).*/',
+    '/node_modules/(?!(@plone|@root|@package|@eeacms|@plone-collective)/).*/',
   ],
   transform: {
     '^.+\\.js(x)?$': 'babel-jest',
+    '^.+\\.ts(x)?$': 'babel-jest',
     '^.+\\.(png)$': 'jest-file',
     '^.+\\.(jpg)$': 'jest-file',
     '^.+\\.(svg)$': './node_modules/@plone/volto/jest-svgsystem-transform.js',
   },
   coverageThreshold: {
     global: {
-      branches: 1,
-      functions: 1,
-      lines: 1,
-      statements: 1,
+      branches: 5,
+      functions: 5,
+      lines: 5,
+      statements: 5,
     },
   },
   ...(process.env.JEST_USE_SETUP === 'ON' && {
     setupFilesAfterEnv: [
-      '<rootDir>/node_modules/@eeacms/volto-marine-policy/jest.setup.js',
+      '<rootDir>/node_modules/@eeacms/volto-eea-website-policy/jest.setup.js',
     ],
   }),
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-marine-policy",
-  "version": "1.1.17",
+  "version": "2.0.0",
   "description": "@eeacms/volto-marine-policy: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",
@@ -16,32 +16,33 @@
     "type": "git",
     "url": "git@github.com:eea/volto-marine-policy.git"
   },
-  "resolutions": {
-    "react-countup/countup.js": "2.5.0",
-    "d3-array": "^2.12.1",
-    "@elastic/search-ui": "1.21.2",
-    "@eeacms/volto-searchlib": "^0.9.3"
-  },
   "addons": [
     "@eeacms/volto-tabs-block",
     "@eeacms/volto-embed",
     "@eeacms/volto-eea-design-system",
     "@eeacms/volto-eea-website-theme",
-    "@eeacms/volto-globalsearch",
-    "@eeacms/volto-searchlib"
+    "@eeacms/volto-globalsearch"
   ],
+  "resolutions": {
+    "react-countup/countup.js": "2.5.0",
+    "d3-array": "^2.12.1",
+    "@eeacms/volto-searchlib": "1.0.0",
+    "@eeacms/countup": "^2.0.6",
+    "@elastic/search-ui": "1.21.2"
+  },
   "dependencies": {
     "@eeacms/volto-eea-design-system": "*",
-    "@eeacms/volto-eea-website-theme": "^1.33.2",
-    "@eeacms/volto-embed": "^9.1.1",
-    "@eeacms/volto-globalsearch": "^1.0.20",
-    "@eeacms/volto-searchlib": "^0.6.3",
-    "@eeacms/volto-tabs-block": "*",
+    "@eeacms/volto-eea-website-theme": "^2.1.2",
+    "@eeacms/volto-searchlib": "^2.0.2",
+    "@eeacms/volto-embed": "^10.0.2",
+    "@eeacms/volto-globalsearch": "^2.0.0",
+    "@eeacms/volto-tabs-block": "^8.0.0",
     "axios": "0.25.0",
     "jquery": "3.6.0",
     "razzle-plugin-scss": "^4.2.18",
     "react-lazy-load-image-component": "^1.4.0",
     "react-slick": "^0.24.0",
+    "d3-array": "^2.12.1",
     "slick-carousel": "^1.8.1"
   },
   "devDependencies": {
@@ -49,7 +50,11 @@
     "@cypress/code-coverage": "^3.9.5",
     "@plone/scripts": "2.1.1",
     "babel-plugin-transform-class-properties": "^6.24.1",
-    "dotenv": "^16.3.2"
+    "cypress": "13.1.0",
+    "dotenv": "^16.3.2",
+    "husky": "^8.0.3",
+    "lint-staged": "^14.0.1",
+    "md5": "^2.3.0"
   },
   "scripts": {
     "release": "release-it",

package/src/components/Blocks/ContextNavigation/Accordion.test.jsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { MemoryRouter } from 'react-router-dom';
 import configureStore from 'redux-mock-store';
-import { render } from '@testing-library/react';
+import { render, fireEvent, waitFor, screen } from '@testing-library/react';
 import '@testing-library/jest-dom/extend-expect';
 import { Provider } from 'react-intl-redux';
 import Accordion from './Accordion';
@@ -9,22 +9,11 @@ import Accordion from './Accordion';
 const mockStore = configureStore();
 
 describe('RASTAccordion', () => {
-  it('should render the component', () => {
-    const data = {
-      items: [
-        {
-          id: 'my-item',
-          title: 'Hello',
-          '@id': '/my-item',
-          '@type': 'Folder',
-          href: '/my-item-href',
-        },
-      ],
-      activeMenu: 1,
-      curent_location: '/my-item-href',
-    };
+  let store;
+  let data;
 
-    const store = mockStore({
+  beforeEach(() => {
+    store = mockStore({
       userSession: { token: '1234' },
       intl: {
         locale: 'en',
@@ -35,6 +24,56 @@ describe('RASTAccordion', () => {
       },
     });
 
+    data = {
+      items: [
+        {
+          id: 'item1',
+          title: 'Item 1',
+          '@id': '/item1',
+          '@type': 'Folder',
+          href: '/item1-href',
+        },
+        {
+          id: 'item2',
+          title: 'Item 2',
+          '@id': '/item2',
+          '@type': 'Folder',
+          href: '/item2-href',
+        },
+      ],
+      activeMenu: 1,
+      curent_location: '/item1-href',
+      data: { title: "Accordion's Title" },
+    };
+  });
+
+  it('renders the component with initial data', () => {
+    const { getByText } = render(
+      <Provider store={store}>
+        <MemoryRouter>
+          <Accordion {...data} />
+        </MemoryRouter>
+      </Provider>,
+    );
+
+    expect(getByText('Item 1')).toBeInTheDocument();
+    expect(getByText('Item 2')).toBeInTheDocument();
+  });
+
+  it('navigates to correct path on item click', () => {
+    const { getByText, history } = render(
+      <Provider store={store}>
+        <MemoryRouter>
+          <Accordion {...data} />
+        </MemoryRouter>
+      </Provider>,
+    );
+
+    fireEvent.click(getByText('Item 1'));
+    waitFor(() => expect(history.location.pathname).toBe('/item1'));
+  });
+
+  it('clicks on accordion items', () => {
     const { container } = render(
       <Provider store={store}>
         <MemoryRouter>
@@ -42,6 +81,26 @@ describe('RASTAccordion', () => {
         </MemoryRouter>
       </Provider>,
     );
-    expect(container.querySelector('.accordion')).toBeInTheDocument();
+
+    screen.debug();
+
+    // check that item1 is expanded by default
+    expect(container.querySelector('#item2 .active.title')).toBeInTheDocument();
+
+    const item1 = container.querySelector('#item1');
+    fireEvent.click(item1);
+  });
+
+  it('responds to keyboard events', () => {
+    const { getByText } = render(
+      <Provider store={store}>
+        <MemoryRouter>
+          <Accordion {...data} />
+        </MemoryRouter>
+      </Provider>,
+    );
+
+    fireEvent.keyDown(getByText('Item 1'), { keyCode: 13 }); // Enter key
+    waitFor(() => expect(getByText('Content of Item 1')).toBeVisible());
   });
 });

package/src/components/Blocks/ContextNavigation/schema.js

@@ -1,6 +1,6 @@
 const fields = ['root_path', 'title', 'types'];
 
-export default ({ contentTypes }) => {
+const schema = ({ contentTypes }) => {
   const availableTypes = contentTypes.map((type) => [
     type.id,
     type.title || type.name,
@@ -39,3 +39,5 @@ export default ({ contentTypes }) => {
     required: [],
   };
 };
+
+export default schema;

package/src/components/Blocks/MsfdDataExplorerBlock/View.test.jsx

@@ -0,0 +1,42 @@
+import { render, waitFor, screen } from '@testing-library/react';
+import axios from 'axios';
+import '@testing-library/jest-dom/extend-expect';
+
+import MsfdDataExplorerBlockView from './View';
+
+jest.mock('axios');
+
+describe('MsfdDataExplorerBlockView', () => {
+  const mockHtmlResponse = '<div class="msfd-search-wrapper">Content</div>';
+
+  beforeEach(() => {
+    axios.get.mockClear();
+  });
+
+  it('should prompt to select an article when none is selected', () => {
+    const { getByText } = render(
+      <MsfdDataExplorerBlockView data={{}} editable={true} />,
+    );
+    expect(getByText('Select article')).toBeInTheDocument();
+  });
+
+  it('displays loader while fetching data', () => {
+    axios.get.mockResolvedValueOnce({ data: mockHtmlResponse });
+    render(
+      <MsfdDataExplorerBlockView
+        Network={false}
+        data={{ article_select: 'article1' }}
+      />,
+    );
+    expect(screen.getByText('Loading')).toBeInTheDocument();
+  });
+
+  it('renders content upon successful data fetch', async () => {
+    axios.get.mockResolvedValueOnce({ data: mockHtmlResponse });
+    render(<MsfdDataExplorerBlockView data={{ article_select: 'article1' }} />);
+
+    await waitFor(() => {
+      expect(screen.getByText('Content')).toBeInTheDocument();
+    });
+  });
+});

package/src/components/Blocks/MsfdDataExplorerBlock/index.js

@@ -2,7 +2,7 @@ import worldSVG from '@plone/volto/icons/world.svg';
 import MsfdDataExplorerBlockView from './View';
 import MsfdDataExplorerBlockEdit from './Edit';
 
-export default (config) => {
+const config = (config) => {
   config.blocks.blocksConfig.msfdDataExplorerBlock = {
     id: 'msfdDataExplorerBlock',
     title: 'MSFD Data explorer block',
@@ -21,3 +21,5 @@ export default (config) => {
   };
   return config;
 };
+
+export default config;

package/src/components/Widgets/MeasureViewWidget.jsx

@@ -21,7 +21,7 @@ function IsomorphicPortal({ children }) {
 }
 
 const MeasureView = (props) => {
-  const { origin } = props?.content;
+  const { origin } = props.content;
 
   //conditional fields shown in view based on origin of measure
   const conditions = {

package/src/components/Widgets/String.jsx

@@ -1,15 +1,15 @@
 import React from 'react';
 
-const String = ({ val }) => {
+const StringWidget = ({ val }) => {
   return typeof val === 'string'
     ? val
     : Array.isArray(val)
     ? val.map((item, i) => (
         <span key={i} className="array-string-item">
-          <String val={item} key={i} />
+          <StringWidget val={item} key={i} />
         </span>
       ))
     : `${val}`;
 };
 
-export default String;
+export default StringWidget;

package/src/components/Widgets/TextAlign.jsx

@@ -14,7 +14,7 @@ const VALUE_MAP = [
   ['justify', alignJustifySVG],
 ];
 
-export default (props) => {
+function TextAlign(props) {
   const { value, onChange, id } = props;
   return (
     <FormFieldWrapper {...props}>
@@ -38,4 +38,6 @@ export default (props) => {
       </div>
     </FormFieldWrapper>
   );
-};
+}
+
+export default TextAlign;

package/src/components/Widgets/TextAlign.test.jsx

@@ -0,0 +1,33 @@
+import React from 'react';
+import renderer from 'react-test-renderer';
+import configureStore from 'redux-mock-store';
+import { Provider } from 'react-intl-redux';
+
+import TextAlign from './TextAlign';
+
+const mockStore = configureStore();
+
+test('renders a text align component', () => {
+  const store = mockStore({
+    intl: {
+      locale: 'en',
+      messages: {},
+    },
+  });
+
+  const component = renderer.create(
+    <Provider store={store}>
+      <TextAlign
+        id="my-field"
+        title="My field"
+        value="left"
+        fieldSet="default"
+        onChange={() => {}}
+        onBlur={() => {}}
+        onClick={() => {}}
+      />
+    </Provider>,
+  );
+  const json = component.toJSON();
+  expect(json).toMatchSnapshot();
+});

package/src/components/theme/AppExtras/index.js

@@ -1,7 +1,7 @@
 import ScrollToTop from './ScrollToTop';
 // import PrintPage from './PrintPage';
 
-export default (config) => {
+const config = (config) => {
   config.settings.appExtras = [
     ...(config.settings.appExtras || []),
     {
@@ -16,3 +16,5 @@ export default (config) => {
 
   return config;
 };
+
+export default config;

package/src/components/theme/Header/HeroSection.jsx

@@ -3,12 +3,8 @@ import React from 'react';
 import './less/herosection.less';
 
 function HeroSection(props) {
-  const {
-    image_caption,
-    image_url,
-    content_description,
-    content_title,
-  } = props;
+  const { image_caption, image_url, content_description, content_title } =
+    props;
 
   return (
     <>

package/src/components/theme/Header/HeroSection.test.jsx

@@ -0,0 +1,30 @@
+import React from 'react';
+import renderer from 'react-test-renderer';
+import configureStore from 'redux-mock-store';
+import { Provider } from 'react-intl-redux';
+
+import HeroSection from './HeroSection';
+
+const mockStore = configureStore();
+
+test('renders Hero section component', () => {
+  const store = mockStore({
+    intl: {
+      locale: 'en',
+      messages: {},
+    },
+  });
+
+  const component = renderer.create(
+    <Provider store={store}>
+      <HeroSection
+        image_caption="caption"
+        image_url="https://www.google.com"
+        content_description="description"
+        content_title="title"
+      />
+    </Provider>,
+  );
+  const json = component.toJSON();
+  expect(json).toMatchSnapshot();
+});

package/src/components/theme/Header/StickyHeader.test.jsx

@@ -0,0 +1,25 @@
+import React from 'react';
+import renderer from 'react-test-renderer';
+import configureStore from 'redux-mock-store';
+import { Provider } from 'react-intl-redux';
+
+import StickyHeader from './StickyHeader';
+
+const mockStore = configureStore();
+
+test('renders a sticky header component', () => {
+  const store = mockStore({
+    intl: {
+      locale: 'en',
+      messages: {},
+    },
+  });
+
+  const component = renderer.create(
+    <Provider store={store}>
+      <StickyHeader stickyBreakpoint={700} />
+    </Provider>,
+  );
+  const json = component.toJSON();
+  expect(json).toMatchSnapshot();
+});

package/src/components/theme/MetadataListingView/style.less

@@ -200,8 +200,8 @@ svg.selected {
   width: 32px;
   height: 32px;
   padding: 2px !important;
-  background-color: @orange !important;
   border-radius: 3px !important;
+  background-color: @orange !important;
   color: @white !important;
 
   &:hover {

package/src/customizations/volto/components/manage/Toolbar/Toolbar.jsx

@@ -590,8 +590,8 @@ class Toolbar extends Component {
                   messages.shrinkToolbar,
                 )}
                 className={cx({
-                  [this.props.content?.review_state]: this.props.content
-                    ?.review_state,
+                  [this.props.content?.review_state]:
+                    this.props.content?.review_state,
                 })}
                 onClick={this.handleShrink}
               />

package/src/index.js

@@ -170,11 +170,10 @@ const applyConfig = (config) => {
     },
   ];
 
-  // do not expand breadcrumbs. This fixed the breadcrumbs in contents view. The hasApiExpander needs to be made
-  // generic to also look for nonContentRoutes.
+  //In volto 17, we expand everyting by-default. Do not expand navigation, required for fat-menu to work
   (config.settings.apiExpanders || []).forEach((item) => {
-    if (item.GET_CONTENT.includes('breadcrumbs')) {
-      item.GET_CONTENT.splice(item.GET_CONTENT.indexOf('breadcrumbs', 1));
+    if (item.GET_CONTENT.includes('navigation')) {
+      item.GET_CONTENT.splice(item.GET_CONTENT.indexOf('navigation', 1));
     }
   });
 
@@ -236,30 +235,7 @@ const applyConfig = (config) => {
     // },
     {
       match: {
-        path:
-          '/(.*)marine(-new)?/policy-and-reporting/reports-and-assessments(.*)',
-        exact: false,
-        strict: false,
-      },
-      url(payload) {
-        return payload.location.pathname;
-      },
-    },
-    {
-      match: {
-        path:
-          '/(.*)marine(-new)?/policy-and-reporting/assessment-by-country(.*)',
-        exact: false,
-        strict: false,
-      },
-      url(payload) {
-        return payload.location.pathname;
-      },
-    },
-    {
-      match: {
-        path:
-          '/(.*)marine(-new)?/policy-and-reporting/assessment-by-region(.*)',
+        path: '/(.*)marine(-new)?/policy-and-reporting/reports-and-assessments(.*)',
         exact: false,
         strict: false,
       },
@@ -267,6 +243,28 @@ const applyConfig = (config) => {
         return payload.location.pathname;
       },
     },
+    // {
+    //   match: {
+    //     path:
+    //       '/(.*)marine(-new)?/policy-and-reporting/assessment-by-country(.*)',
+    //     exact: false,
+    //     strict: false,
+    //   },
+    //   url(payload) {
+    //     return payload.location.pathname;
+    //   },
+    // },
+    // {
+    //   match: {
+    //     path:
+    //       '/(.*)marine(-new)?/policy-and-reporting/assessment-by-region(.*)',
+    //     exact: false,
+    //     strict: false,
+    //   },
+    //   url(payload) {
+    //     return payload.location.pathname;
+    //   },
+    // },
   ];
 
   config.settings.openExternalLinkInNewTab = true;

package/src/search/facets.js

@@ -104,6 +104,8 @@ const facets = [
   }),
 ];
 
-export default {
+const facetsObj = {
   facets,
 };
+
+export default facetsObj;

package/src/search/views.js

@@ -1,4 +1,4 @@
-export default {
+const views = {
   resultViews: [
     {
       id: 'marineMeasureCard',
@@ -55,3 +55,5 @@ export default {
     ],
   },
 };
+
+export default views;

package/src/utils.test.js

@@ -0,0 +1,70 @@
+import {
+  getPath,
+  getScaleUrl,
+  formatItemType,
+  doStringifySearchquery,
+  deStringifySearchquery,
+} from './utils';
+
+describe('getPath', () => {
+  it('returns the pathname for a fully qualified URL', () => {
+    const url = 'http://example.com/some/path';
+    expect(getPath(url)).toBe('/some/path');
+  });
+
+  it('returns the input URL if it is not fully qualified', () => {
+    const url = '/some/path';
+    expect(getPath(url)).toBe(url);
+  });
+
+  it('handles edge case with no input', () => {
+    expect(getPath('')).toBe('');
+  });
+});
+
+describe('getScaleUrl', () => {
+  it('returns a scaled image URL for internal API URLs', () => {
+    const url = '/api/some/path';
+    const size = 'large';
+    expect(getScaleUrl(url, size)).toBe('/some/path/@@images/image/large');
+  });
+
+  it('returns a scaled image URL for external URLs', () => {
+    const url = 'http://example.com/api/some/path';
+    const size = 'medium';
+    expect(getScaleUrl(url, size)).toBe(
+      'http://example.com/some/path/@@images/image/medium',
+    );
+  });
+
+  it('handles null inputs', () => {
+    expect(getScaleUrl(null, 'small')).toBe('undefined/@@images/image/small');
+  });
+});
+
+describe('formatItemType', () => {
+  it('formats item types correctly', () => {
+    expect(formatItemType('type_example')).toBe('Type / Example');
+  });
+
+  it('returns an empty string for empty input', () => {
+    expect(formatItemType('')).toBe('');
+  });
+
+  it('handles types without underscores', () => {
+    expect(formatItemType('typeexample')).toBe('Typeexample');
+  });
+});
+
+describe('Search query conversion', () => {
+  const queryString = 'key1=value1&key2=value2';
+  const jsonString = '{"key1":["value1"],"key2":["value2"]}';
+
+  it('converts query string to JSON string', () => {
+    expect(doStringifySearchquery(queryString)).toBe(jsonString);
+  });
+
+  it('converts JSON string to query string', () => {
+    expect(deStringifySearchquery(jsonString)).toBe(queryString);
+  });
+});