@eeacms/volto-cca-policy 0.1.92 → 0.1.93

package/.eslintrc.js

@@ -0,0 +1,61 @@
+const fs = require('fs');
+const path = require('path');
+const projectRootPath = fs.realpathSync(__dirname + '/../../../');
+
+let voltoPath = path.join(projectRootPath, 'node_modules/@plone/volto');
+let configFile;
+if (fs.existsSync(`${projectRootPath}/tsconfig.json`))
+  configFile = `${projectRootPath}/tsconfig.json`;
+else if (fs.existsSync(`${projectRootPath}/jsconfig.json`))
+  configFile = `${projectRootPath}/jsconfig.json`;
+
+if (configFile) {
+  const jsConfig = require(configFile).compilerOptions;
+  const pathsConfig = jsConfig.paths;
+  if (pathsConfig['@plone/volto'])
+    voltoPath = `./${jsConfig.baseUrl}/${pathsConfig['@plone/volto'][0]}`;
+}
+
+const AddonConfigurationRegistry = require(`${voltoPath}/addon-registry.js`);
+const reg = new AddonConfigurationRegistry(projectRootPath);
+
+// Extends ESlint configuration for adding the aliases to `src` directories in Volto addons
+const addonAliases = Object.keys(reg.packages).map((o) => [
+  o,
+  reg.packages[o].modulePath,
+]);
+
+const addonExtenders = reg.getEslintExtenders().map((m) => require(m));
+
+const defaultConfig = {
+  extends: `${voltoPath}/.eslintrc`,
+  settings: {
+    'import/resolver': {
+      alias: {
+        map: [
+          ['@plone/volto', '@plone/volto/src'],
+          ['@plone/volto-slate', '@plone/volto/packages/volto-slate/src'],
+          ['@root/routes', '@plone/volto/src'],
+          ...addonAliases,
+          ['@package', `${__dirname}/src`],
+          // ['@root', `${__dirname}/src`],
+          ['~', `${__dirname}/src`],
+        ],
+        extensions: ['.js', '.jsx', '.json'],
+      },
+      'babel-plugin-root-import': {
+        rootPathSuffix: 'src',
+      },
+    },
+  },
+  rules: {
+    'react/jsx-no-target-blank': 'off',
+  },
+};
+
+const config = addonExtenders.reduce(
+  (acc, extender) => extender.modify(acc),
+  defaultConfig,
+);
+
+module.exports = config;

package/CHANGELOG.md

@@ -4,6 +4,46 @@ 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).
 
+### [0.1.93](https://github.com/eea/volto-cca-policy/compare/0.1.92...0.1.93) - 8 March 2024
+
+#### :rocket: New Features
+
+- feat: add AnchorLink to smooth scroll to sections [kreafox - [`997d732`](https://github.com/eea/volto-cca-policy/commit/997d732e8cbb679e5944db5197174109fc7df315)]
+
+#### :bug: Bug Fixes
+
+- fix(views): show info only on observatory [kreafox - [`fbc7558`](https://github.com/eea/volto-cca-policy/commit/fbc7558b062c89af891d75c41735b334a1775594)]
+- fix(views): fix case when we use thumbnail instead of logo [kreafox - [`0222507`](https://github.com/eea/volto-cca-policy/commit/02225070d6dea7211e4ecd5d8608ef6749590789)]
+- fix:unable to resolve path to module @eeacms/search [ana-oprea - [`0abeaf3`](https://github.com/eea/volto-cca-policy/commit/0abeaf36b3123e3f9c738e1593681e39b78ca4c1)]
+- fix(views): share info button link [kreafox - [`af797f0`](https://github.com/eea/volto-cca-policy/commit/af797f07571c95f94aef62ae680d72019493431d)]
+- fix(views): fix metadata for db items [kreafox - [`cc81806`](https://github.com/eea/volto-cca-policy/commit/cc818068ed389a53ca517d95e81fad58a88bbebd)]
+
+#### :nail_care: Enhancements
+
+- change(views): update section layout on Adaptation Option [kreafox - [`3ee4fb7`](https://github.com/eea/volto-cca-policy/commit/3ee4fb7a378435555726cbb9f04c3914995d1643)]
+- change(views): add IPCC metadata [kreafox - [`a66ad07`](https://github.com/eea/volto-cca-policy/commit/a66ad07be594c8dc1dbec1f5f7b0ef17c0116042)]
+
+#### :house: Internal changes
+
+- style(views): fix icon position in DocumentList [kreafox - [`7cc9fa8`](https://github.com/eea/volto-cca-policy/commit/7cc9fa8cf2b3bda26eafd17316ab4e8449e0c500)]
+
+#### :hammer_and_wrench: Others
+
+- Add transparent overlay for collection stats, to make it easier to select the block [Tiberiu Ichim - [`6c8507a`](https://github.com/eea/volto-cca-policy/commit/6c8507a928ffd53d8c6b5384ff492839bfc42c77)]
+- Add another migration button [Tiberiu Ichim - [`5759f2c`](https://github.com/eea/volto-cca-policy/commit/5759f2cd5c4cca7937f74d3f398157ec120524b9)]
+- update path [Teodor - [`0ddd49f`](https://github.com/eea/volto-cca-policy/commit/0ddd49f12cb3b33fba1fda0819b2967bd6948029)]
+- cleanup code [kreafox - [`b096c4c`](https://github.com/eea/volto-cca-policy/commit/b096c4c71ab7c9d04acb2908c6a5e023af41801c)]
+- update rule [Teodor - [`d6f0bba`](https://github.com/eea/volto-cca-policy/commit/d6f0bbabda5279b56a0cf3dcd395cea7852ed915)]
+- test: update snapshots [kreafox - [`afde48c`](https://github.com/eea/volto-cca-policy/commit/afde48c32b461ec06592fc0adb195a4995170998)]
+- test: Update jest,Jenkinsfile,lint to volto-addons-template PR30 [valentinab25 - [`0ab94c8`](https://github.com/eea/volto-cca-policy/commit/0ab94c8a8ff7c457b02ad2b177b79f2b18936e50)]
+- remove eslintrc [Teodor - [`4020b91`](https://github.com/eea/volto-cca-policy/commit/4020b918d28efa18073fb87b011ab2702addf518)]
+- eslintrc removed from gitignore [Teodor - [`f427a9c`](https://github.com/eea/volto-cca-policy/commit/f427a9c8baa29d20d41fd901dda039f251e6fdba)]
+- revert razzle extend config [Teodor - [`b849609`](https://github.com/eea/volto-cca-policy/commit/b84960945009e9821c21a423f8d5f8eec3b21f80)]
+- update eslint rule [Teodor - [`dc1b2c2`](https://github.com/eea/volto-cca-policy/commit/dc1b2c22caa3b0d2359d08093a12a33ee2c65a06)]
+- add eslint rules [Teodor - [`8ab2af3`](https://github.com/eea/volto-cca-policy/commit/8ab2af3336f3c6b4416db1c79df1b9a44383f310)]
+- Fix navigation children [Tiberiu Ichim - [`4ef429d`](https://github.com/eea/volto-cca-policy/commit/4ef429d1b3c4ac359f27741d54f44092e81d4d4d)]
+- Add translate button [Tiberiu Ichim - [`6d4751e`](https://github.com/eea/volto-cca-policy/commit/6d4751e0750373c1e9dd657dc9346c5590ef38d0)]
+- Simplify code [Tiberiu Ichim - [`900e867`](https://github.com/eea/volto-cca-policy/commit/900e867db1d45a3a2f042eb9763c306528346509)]
 ### [0.1.92](https://github.com/eea/volto-cca-policy/compare/0.1.91...0.1.92) - 6 March 2024
 
 #### :rocket: New Features
@@ -604,13 +644,10 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - Refs #260715 rast-block wip [Tripon Eugen - [`f19d54e`](https://github.com/eea/volto-cca-policy/commit/f19d54e0b9a6a86bf344eb85b6a1cda7f3de91bf)]
 - Refs #260715 rast-block wip [Tripon Eugen - [`2828537`](https://github.com/eea/volto-cca-policy/commit/2828537b6c084cd1a82162d552fb4ef025b71f9f)]
 - Refs #260715 rast-block updates [Tripon Eugen - [`1e803e5`](https://github.com/eea/volto-cca-policy/commit/1e803e5bd3d3fb7558f261c76c68866be7beb8b5)]
-- test: [JENKINS] Use java17 for sonarqube scanner [valentinab25 - [`0a15e1b`](https://github.com/eea/volto-cca-policy/commit/0a15e1b2ad081233685e80d5b3c60a8663f6b896)]
-- test: [JENKINS] Run cypress in started frontend container [valentinab25 - [`9554e44`](https://github.com/eea/volto-cca-policy/commit/9554e44c92a621a52b2adb5a4830fb084ee5734b)]
 ### [0.1.49](https://github.com/eea/volto-cca-policy/compare/0.1.48...0.1.49) - 15 November 2023
 
 #### :house: Internal changes
 
-- chore: [JENKINS] Refactor automated testing [valentinab25 - [`7b820a6`](https://github.com/eea/volto-cca-policy/commit/7b820a6369c2ddd5203b1a4abe352cb4bb43db7a)]
 - chore: husky, lint-staged use fixed versions [valentinab25 - [`f0a8061`](https://github.com/eea/volto-cca-policy/commit/f0a8061c275c236deb00087c23fac9860a073106)]
 
 #### :hammer_and_wrench: Others
@@ -627,9 +664,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - Refs #259267 - jenkins test [Tripon Eugen - [`cacd31e`](https://github.com/eea/volto-cca-policy/commit/cacd31e7b1afe0983674ed5c7632d2e1d7fa752e)]
 - Refs #259267 - jenkins [Tripon Eugen - [`5b3affe`](https://github.com/eea/volto-cca-policy/commit/5b3affee8401239de10097884c1b7f2349d15ec0)]
 - Refs #259267 - add When, lead image and title to files [Tripon Eugen - [`2cedb23`](https://github.com/eea/volto-cca-policy/commit/2cedb237f898af9057e13fba94b615ef71077204)]
-- test: [JENKINS] Add cpu limit on cypress docker [valentinab25 - [`4d607a5`](https://github.com/eea/volto-cca-policy/commit/4d607a576e9d0a5c34e48c41b409e7df616ee3d6)]
-- test: [JENKINS] Increase shm-size to cypress docker [valentinab25 - [`b7f74d5`](https://github.com/eea/volto-cca-policy/commit/b7f74d53513a6edbfbca5cb6d19687929bb1e5db)]
-- test: [JENKINS] Improve cypress time [valentinab25 - [`db65617`](https://github.com/eea/volto-cca-policy/commit/db656173391f65157098d95d388c25f6429753d8)]
 - Refs #259267 - cca event blocks attachments and check not mandatoty fields [Tripon Eugen - [`3138e5a`](https://github.com/eea/volto-cca-policy/commit/3138e5afb5bfbdbed14e27ed457b16867b7fa414)]
 - Refs #256681 - Fix error in CCA Event view menu. ([React Intl] An id must be provided to format a message.) [GhitaB - [`517eeb8`](https://github.com/eea/volto-cca-policy/commit/517eeb817264a47bbfd6b9b7d22aaf22d44ed224)]
 - Refs #161485 - Fix ECDE name conflict. [GhitaB - [`8bfd99f`](https://github.com/eea/volto-cca-policy/commit/8bfd99ff68bb82a04d1c0ed625fa514fcf46289e)]
@@ -846,7 +880,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 #### :house: Internal changes
 
-- chore: [JENKINS] Remove alpha testing version [valentinab25 - [`ad1ced0`](https://github.com/eea/volto-cca-policy/commit/ad1ced0971ba116c13a3b5fcc039172cc915c919)]
 
 #### :hammer_and_wrench: Others
 
@@ -1327,7 +1360,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 #### :hammer_and_wrench: Others
 
 - Refs #158294 - Update supported languages list. [GhitaB - [`0a4f91f`](https://github.com/eea/volto-cca-policy/commit/0a4f91f39b7edc367bd4c127d6a8f273c7788361)]
-- Add Sonarqube tag using cca-frontend addons list [EEA Jenkins - [`8f1f9ce`](https://github.com/eea/volto-cca-policy/commit/8f1f9ce6c22805670cc0800d3c779b6d619d0f31)]
 ### [0.1.1](https://github.com/eea/volto-cca-policy/compare/0.1.0...0.1.1) - 13 December 2022
 
 #### :hammer_and_wrench: Others

package/jest-addon.config.js

@@ -1,3 +1,5 @@
+require('dotenv').config({ path: __dirname + '/.env' })
+
 module.exports = {
   testMatch: ['**/src/addons/**/?(*.)+(spec|test).[jt]s?(x)'],
   collectCoverageFrom: [
@@ -9,16 +11,23 @@ module.exports = {
     '@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>/src/$1',
-    '@root/(.*)$': '<rootDir>/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/(.*?)/(.*)$': '<rootDir>/node_modules/@eeacms/$1/src/$2',
-    '@plone/volto-slate':
+    '@plone/volto-slate$':
       '<rootDir>/node_modules/@plone/volto/packages/volto-slate/src',
+    '@plone/volto-slate/(.*)$':
+      '<rootDir>/node_modules/@plone/volto/packages/volto-slate/src/$1',
     '~/(.*)$': '<rootDir>/src/$1',
     'load-volto-addons':
       '<rootDir>/node_modules/@plone/volto/jest-addons-loader.js',
   },
+  transformIgnorePatterns: [
+    '/node_modules/(?!(@plone|@root|@package|@eeacms)/).*/',
+  ],
   transform: {
     '^.+\\.js(x)?$': 'babel-jest',
     '^.+\\.(png)$': 'jest-file',
@@ -33,4 +42,9 @@ module.exports = {
       statements: 5,
     },
   },
-};
+  ...(process.env.JEST_USE_SETUP === 'ON' && {
+    setupFilesAfterEnv: [
+      '<rootDir>/node_modules/@eeacms/volto-cca-policy/jest.setup.js',
+    ],
+  }),
+}

package/jest.setup.js

@@ -0,0 +1,65 @@
+import { jest } from '@jest/globals';
+import configureStore from 'redux-mock-store';
+import thunk from 'redux-thunk';
+import { blocksConfig } from '@plone/volto/config/Blocks';
+import installSlate from '@plone/volto-slate/index';
+
+var mockSemanticComponents = jest.requireActual('semantic-ui-react');
+var mockComponents = jest.requireActual('@plone/volto/components');
+var config = jest.requireActual('@plone/volto/registry').default;
+
+config.blocks.blocksConfig = {
+  ...blocksConfig,
+  ...config.blocks.blocksConfig,
+};
+
+jest.doMock('semantic-ui-react', () => ({
+  __esModule: true,
+  ...mockSemanticComponents,
+  Popup: ({ content, trigger }) => {
+    return (
+      <div className="popup">
+        <div className="trigger">{trigger}</div>
+        <div className="content">{content}</div>
+      </div>
+    );
+  },
+}));
+
+jest.doMock('@plone/volto/components', () => {
+  return {
+    __esModule: true,
+    ...mockComponents,
+    SidebarPortal: ({ children }) => <div id="sidebar">{children}</div>,
+  };
+});
+
+jest.doMock('@plone/volto/registry', () =>
+  [installSlate].reduce((acc, apply) => apply(acc), config),
+);
+
+const mockStore = configureStore([thunk]);
+
+global.fetch = jest.fn(() =>
+  Promise.resolve({
+    json: () => Promise.resolve({}),
+  }),
+);
+
+global.store = mockStore({
+  intl: {
+    locale: 'en',
+    messages: {},
+    formatMessage: jest.fn(),
+  },
+  content: {
+    create: {},
+    subrequests: [],
+  },
+  connected_data_parameters: {},
+  screen: {
+    page: {
+      width: 768,
+    },
+  },
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-cca-policy",
-  "version": "0.1.92",
+  "version": "0.1.93",
   "description": "@eeacms/volto-cca-policy: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",

package/src/components/MigrationButtons.jsx

@@ -1,54 +1,67 @@
 import { Plug } from '@plone/volto/components/manage/Pluggable';
 import { getBaseUrl } from '@plone/volto/helpers';
 
+const button = (id, title, label, destination) => (
+  <button
+    className={`circle-right-btn `}
+    id={id}
+    onClick={() => window.open(destination, '_blank')}
+    title={title}
+  >
+    {label}
+  </button>
+);
+
 function MigrationButtons(props) {
   const { content, token, pathname } = props;
   const contentId = content?.['@id'] || '';
   const show = !!token && contentId && contentId.indexOf('europa.eu') === -1;
   const base = getBaseUrl(pathname);
+  const buttons = [
+    button(
+      'migration',
+      'Migrate context',
+      'M',
+      `http://localhost:8080/cca/${base}/@@volto_migrate`,
+    ),
+    button(
+      'view',
+      'View original',
+      'V',
+      `https://climate-adapt.eea.europa.eu${base}`,
+    ),
+    button(
+      'debug',
+      'Debug',
+      'PDB',
+      `http://localhost:8080/cca/${base}/@@gopdb`,
+    ),
+    button(
+      'translate',
+      'Translate',
+      'T',
+      `http://localhost:8080/cca/${base}/@@volto-html`,
+    ),
+    button(
+      'preview',
+      'Preview Translation',
+      'P',
+      `http://localhost:8080/cca/${base}/@@volto-html?half=1`,
+    ),
+  ];
+
+  if (!show) return null;
 
-  return show ? (
+  return (
     <Plug
       pluggable="main.toolbar.top"
       id="cca-migration-helpers"
       order={0}
       dependencies={[contentId]}
     >
-      <button
-        className={`circle-right-btn `}
-        id="toolbar-migration"
-        onClick={() =>
-          window.open(
-            `http://localhost:8080/cca/${base}/@@volto_migrate`,
-            '_blank',
-          )
-        }
-        title="Migrate context"
-      >
-        M
-      </button>
-
-      <button
-        className={`circle-right-btn `}
-        id="toolbar-view"
-        onClick={() =>
-          window.open(`https://climate-adapt.eea.europa.eu${base}`, '_blank')
-        }
-        title="View original"
-      >
-        V
-      </button>
-
-      <button
-        className={`circle-right-btn`}
-        id="toolbar-migration"
-        onClick={() => window.open(`http://localhost:8080/cca/${base}/@@gopdb`)}
-        title="Migrate context"
-      >
-        PDB
-      </button>
+      {buttons}
     </Plug>
-  ) : null;
+  );
 }
 
 export default MigrationButtons;

package/src/components/manage/Blocks/CollectionStatistics/CollectionStatsEdit.jsx

@@ -3,12 +3,15 @@ import { SidebarPortal } from '@plone/volto/components';
 import InlineForm from '@plone/volto/components/manage/Form/InlineForm';
 import Schema from './schema';
 import View from './CollectionStatsView';
+import TransparentOverlay from '../../TransparentOverlay';
 
 const Edit = (props) => {
   const schema = Schema();
   return (
     <>
-      <View {...props} mode="edit" />
+      <TransparentOverlay>
+        <View {...props} mode="edit" />
+      </TransparentOverlay>
 
       <SidebarPortal selected={props.selected}>
         <InlineForm

package/src/components/manage/TransparentOverlay.jsx

@@ -0,0 +1,11 @@
+const transparentStyle = {
+  pointerEvents: 'none',
+};
+
+export default function TransparentOverlay({ children }) {
+  return (
+    <div className="transparent-overlay" style={transparentStyle}>
+      {children}
+    </div>
+  );
+}

package/src/components/theme/Header.jsx

@@ -141,7 +141,6 @@ const EEAHeader = (props) => {
               <a
                 href="https://europa.eu/european-union/contact/institutions-bodies_en"
                 target="_blank"
-                rel="noreferrer"
                 onKeyDown={(evt) => evt.stopPropagation()}
               >
                 See all EU institutions and bodies
@@ -164,7 +163,6 @@ const EEAHeader = (props) => {
                       href={item.href}
                       className="site"
                       target="_blank"
-                      rel="noreferrer"
                       onKeyDown={(evt) => evt.stopPropagation()}
                     >
                       {item.title}

package/src/components/theme/Views/AdaptationOptionView.jsx

@@ -6,11 +6,12 @@ import {
   PublishedModifiedInfo,
   ShareInfo,
   BannerTitle,
-  LogoWrapper,
+  ItemLogo,
 } from '@eeacms/volto-cca-policy/helpers';
-import { Segment, Divider, Image, Grid } from 'semantic-ui-react';
+import { Segment, Divider, Grid } from 'semantic-ui-react';
 import { UniversalLink } from '@plone/volto/components';
 import { PortalMessage } from '@eeacms/volto-cca-policy/components';
+import AnchorLink from 'react-anchor-link-smooth-scroll';
 
 function createDataField(type, field, section, title) {
   return {
@@ -73,44 +74,42 @@ const SectionsMenu = (props) => {
 
   return (
     <div className="adaptation-details">
-      <div>
-        {sections.length > 0 && (
-          <>
-            <h3>Additional Details</h3>
-            <ul>
-              {sections.map((data, index) => (
-                <li key={index}>
-                  <a href={'#' + sectionID(data.title)}>{data.title}</a>
-                </li>
-              ))}
-            </ul>
-          </>
-        )}
-      </div>
-      <div>
-        <h3>Reference information</h3>
-        <ul>
-          <li>
-            <a href="#websites">Websites</a>
-          </li>
-          <li>
-            <a href="#source">Source</a>
-          </li>
-        </ul>
-      </div>
+      <Grid columns="12">
+        <Grid.Column mobile={12} tablet={12} computer={6}>
+          {sections.length > 0 && (
+            <>
+              <h4>Additional Details</h4>
+              <ul>
+                {sections.map((data, index) => (
+                  <li key={index}>
+                    <AnchorLink href={'#' + sectionID(data.title)}>
+                      {data.title}
+                    </AnchorLink>
+                  </li>
+                ))}
+              </ul>
+            </>
+          )}
+        </Grid.Column>
+        <Grid.Column mobile={12} tablet={12} computer={6}>
+          <h4>Reference information</h4>
+          <ul>
+            <li>
+              <AnchorLink href="#websites">Websites</AnchorLink>
+            </li>
+            <li>
+              <AnchorLink href="#source">Source</AnchorLink>
+            </li>
+          </ul>
+        </Grid.Column>
+      </Grid>
     </div>
   );
 };
 
 function AdaptationOptionView(props) {
   const { content } = props;
-  const {
-    related_case_studies,
-    long_description,
-    ipcc_category,
-    logo,
-    title,
-  } = content;
+  const { related_case_studies, long_description, ipcc_category } = content;
 
   const usedSections = dataDisplay.filter((data) =>
     content?.hasOwnProperty(data.field),
@@ -133,16 +132,7 @@ function AdaptationOptionView(props) {
               computer={8}
               className="col-left"
             >
-              <LogoWrapper logo={logo}>
-                <h2>Description</h2>
-                {logo && (
-                  <Image
-                    src={logo?.scales?.mini?.download}
-                    alt={title}
-                    className="db-logo"
-                  />
-                )}
-              </LogoWrapper>
+              <ItemLogo {...props}></ItemLogo>
               <HTMLField value={long_description} />
               <SectionsMenu sections={usedSections} />
 

package/src/components/theme/Views/C3SIndicatorView.jsx

@@ -5,8 +5,9 @@ import {
   BannerTitle,
   LogoWrapper,
 } from '@eeacms/volto-cca-policy/helpers';
-import { Accordion, Icon, Segment, Image } from 'semantic-ui-react';
+import { Accordion, Icon, Segment, Image, Button } from 'semantic-ui-react';
 import { PortalMessage } from '@eeacms/volto-cca-policy/components';
+import { Link } from 'react-router-dom';
 
 if (!__SERVER__) {
   window.cds_toolbox = {
@@ -170,13 +171,13 @@ function C3SIndicatorView(props) {
 
         <div className="c3s-buttons">
           <a href="#details">
-            <button className="ui button primary" onClick={toggleIframe}>
+            <Button primary onClick={toggleIframe}>
               {showDetails ? 'Go back' : 'Explore in detail'}
-            </button>
-          </a>
-          <a href="/knowledge/european-climate-data-explorer/">
-            <button className="ui button primary">ECDE homepage</button>
+            </Button>
           </a>
+          <Link to="/knowledge/european-climate-data-explorer/">
+            <Button primary>ECDE homepage</Button>
+          </Link>
         </div>
 
         {definition_app && !hasIndicatorTitle && (

package/src/components/theme/Views/CaseStudyView.jsx

@@ -9,8 +9,11 @@ import {
   BannerTitle,
 } from '@eeacms/volto-cca-policy/helpers';
 import { Divider, Grid, Icon, Image } from 'semantic-ui-react';
-import { ImageGallery } from '@eeacms/volto-cca-policy/components';
-import { PortalMessage } from '@eeacms/volto-cca-policy/components';
+import {
+  ImageGallery,
+  PortalMessage,
+} from '@eeacms/volto-cca-policy/components';
+import AnchorLink from 'react-anchor-link-smooth-scroll';
 
 const PrimaryPhoto = (props) => {
   const { content } = props;
@@ -122,7 +125,7 @@ const dataDisplay = [
     field: 'source',
     section: 'source',
     title: 'Source',
-    contentTitle: 'Reference', // override the title in content section
+    contentTitle: 'References', // override the title in content section
     group: 3,
   },
 ];
@@ -180,7 +183,9 @@ const SectionsMenu = (props) => {
           <ul>
             {sections.map((data, index) => (
               <li key={index}>
-                <a href={'#' + sectionID(data.title)}>{data.title}</a>
+                <AnchorLink href={'#' + sectionID(data.title)}>
+                  {data.title}
+                </AnchorLink>
               </li>
             ))}
           </ul>

package/src/components/theme/Views/DatabaseItemView.jsx

@@ -12,21 +12,23 @@ import {
   ReferenceInfo,
   ContentMetadata,
   PublishedModifiedInfo,
-  LogoWrapper,
+  ItemLogo,
   ShareInfo,
   ContentRelatedItems,
   DocumentsList,
   BannerTitle,
 } from '@eeacms/volto-cca-policy/helpers';
 import { PortalMessage } from '@eeacms/volto-cca-policy/components';
-import { Divider, Image, Grid } from 'semantic-ui-react';
+import { isObservatoryURL } from '@eeacms/volto-cca-policy/helpers/Utils';
+import { Divider, Grid } from 'semantic-ui-react';
+import { useLocation } from 'react-router-dom';
 
 const DatabaseItemView = (props) => {
   const { content } = props;
   const type = content['@type'];
+  const location = useLocation();
+  const isObservatoryItem = isObservatoryURL(location.pathname);
   const {
-    logo,
-    title,
     long_description,
     map_graphs,
     organisational_key_activities,
@@ -86,22 +88,17 @@ const DatabaseItemView = (props) => {
               computer={8}
               className="col-left"
             >
-              <LogoWrapper logo={logo}>
-                <h2>Description</h2>
-                {logo && (
-                  <Image
-                    src={logo?.scales?.mini?.download}
-                    alt={title}
-                    className="db-logo"
-                  />
-                )}
-              </LogoWrapper>
+              <ItemLogo {...props}></ItemLogo>
               <HTMLField value={long_description} />
 
-              {organisational_key_activities && (
+              {isObservatoryItem && (
                 <>
-                  <h3>Key activities within climate change and health</h3>
-                  <HTMLField value={organisational_key_activities} />
+                  {organisational_key_activities && (
+                    <>
+                      <h3>Key activities within climate change and health</h3>
+                      <HTMLField value={organisational_key_activities} />
+                    </>
+                  )}
                 </>
               )}
 
@@ -121,17 +118,21 @@ const DatabaseItemView = (props) => {
 
               <ReferenceInfo content={content} />
 
-              {organisational_websites && (
+              {isObservatoryItem && (
                 <>
-                  <h5>Links to further information</h5>
-                  <HTMLField value={organisational_websites} />
-                </>
-              )}
+                  {organisational_websites && (
+                    <>
+                      <h5>Links to further information</h5>
+                      <HTMLField value={organisational_websites} />
+                    </>
+                  )}
 
-              {organisational_contact_information && (
-                <>
-                  <h5>Contact information for the Observatory</h5>
-                  <HTMLField value={organisational_contact_information} />
+                  {organisational_contact_information && (
+                    <>
+                      <h5>Contact information for the Observatory</h5>
+                      <HTMLField value={organisational_contact_information} />
+                    </>
+                  )}
                 </>
               )}
 

package/src/components/theme/Views/ProjectView.jsx

@@ -4,25 +4,17 @@ import {
   ContentMetadata,
   PublishedModifiedInfo,
   ShareInfo,
+  ItemLogo,
   ReferenceInfo,
-  LogoWrapper,
 } from '@eeacms/volto-cca-policy/helpers';
-import { Divider, Image, Grid } from 'semantic-ui-react';
+import { Divider, Grid } from 'semantic-ui-react';
 import { PortalMessage } from '@eeacms/volto-cca-policy/components';
 
 import config from '@plone/volto/registry';
 
 function ProjectView(props) {
   const { content } = props;
-  const {
-    long_description,
-    lead,
-    funding,
-    partners,
-    acronym,
-    title,
-    logo,
-  } = content;
+  const { long_description, lead, funding, partners, acronym, title } = content;
 
   const {
     blocks: { blocksConfig },
@@ -46,6 +38,7 @@ function ProjectView(props) {
         }}
         metadata={{
           ...content,
+          image: '',
           title: title + ' (' + acronym + ')',
         }}
       />
@@ -60,16 +53,7 @@ function ProjectView(props) {
               computer={8}
               className="col-left"
             >
-              <LogoWrapper logo={logo}>
-                <h2>Description</h2>
-                {logo && (
-                  <Image
-                    src={logo?.scales?.mini?.download}
-                    alt={title}
-                    className="db-logo"
-                  />
-                )}
-              </LogoWrapper>
+              <ItemLogo {...props}></ItemLogo>
               <HTMLField value={long_description} />
 
               <Divider />

package/src/helpers/ContentMetadata.jsx

@@ -3,9 +3,16 @@ import {
   BIOREGIONS,
   SUBNATIONAL_REGIONS,
 } from '@eeacms/volto-cca-policy/helpers';
+import {
+  VIDEO,
+  GUIDANCE,
+  INDICATOR,
+  PUBICATION_REPORT,
+} from '@eeacms/volto-cca-policy/helpers/Constants';
 import { Fragment } from 'react';
-import { Popup } from 'semantic-ui-react';
-import { Segment } from 'semantic-ui-react';
+import { Popup, Segment } from 'semantic-ui-react';
+import { isObservatoryURL } from '@eeacms/volto-cca-policy/helpers/Utils';
+import { useLocation } from 'react-router-dom';
 
 function renderElement(value) {
   return [BIOREGIONS[value]];
@@ -224,13 +231,13 @@ function PublicationDateInfo(props) {
   let tooltipText =
     'The date refers to the moment in which the item has been prepared or updated by contributing experts to be submitted for the publication in Climate ADAPT';
 
-  if (portaltype === 'eea.climateadapt.video') {
+  if (portaltype === VIDEO) {
     tooltipText = 'The date refers to the date of release of the video';
   }
   if (
-    portaltype === 'eea.climateadapt.guidancedocument' ||
-    portaltype === 'eea.climateadapt.indicator' ||
-    portaltype === 'eea.climateadapt.publicationreport'
+    portaltype === GUIDANCE ||
+    portaltype === INDICATOR ||
+    portaltype === PUBICATION_REPORT
   ) {
     tooltipText =
       'The date refers to the latest date of publication of the item';
@@ -273,18 +280,32 @@ function ItemsList(props) {
 
 function ContentMetadata(props) {
   const { content } = props;
+  const {
+    sectors,
+    geochars,
+    keywords,
+    elements,
+    duration,
+    spatial_layer,
+    ipcc_category,
+    health_impacts,
+    climate_impacts,
+    governance_level,
+    key_type_measures,
+    funding_programme,
+  } = content;
   const type = content['@type'];
-
-  const hasGeoChars =
-    content?.geochars !== null || content?.spatial_layer.length > 0;
+  const location = useLocation();
+  const isObservatoryItem = isObservatoryURL(location.pathname);
+  const hasGeoChars = geochars !== null || spatial_layer.length > 0;
 
   let date_title;
-  if (type === 'eea.climateadapt.video') {
+  if (type === VIDEO) {
     date_title = 'Date of release:';
   } else if (
-    type === 'eea.climateadapt.publicationreport' ||
-    type === 'eea.climateadapt.indicator' ||
-    type === 'eea.climateadapt.guidancedocument'
+    type === PUBICATION_REPORT ||
+    type === INDICATOR ||
+    type === GUIDANCE
   ) {
     date_title = 'Date of publication:';
   } else {
@@ -299,48 +320,89 @@ function ContentMetadata(props) {
           value={content?.publication_date}
           portaltype={content?.portal_type}
         />
-        {content?.keywords?.length > 0 && (
+
+        {isObservatoryItem && (
+          <>
+            {health_impacts && health_impacts?.length > 0 && (
+              <>
+                <h5>Health impact:</h5>
+                <ItemsList value={health_impacts} />
+              </>
+            )}
+          </>
+        )}
+
+        {keywords && keywords?.length > 0 && (
           <>
             <h5>Keywords:</h5>
-            <span>{content?.keywords?.sort().join(', ')}</span>
+            <span>{keywords?.sort().join(', ')}</span>
           </>
         )}
-        {content?.climate_impacts?.length > 0 && (
+
+        {key_type_measures && key_type_measures?.length > 0 && (
           <>
-            <h5>Climate impacts:</h5>
-            <ItemsList value={content.climate_impacts} />
+            <h5>Key Type Measures:</h5>
+            <ItemsList value={key_type_measures} />
           </>
         )}
-        {content?.elements?.length > 0 && (
+
+        {ipcc_category && ipcc_category?.length > 0 && (
           <>
-            <h5> Adaptation elements:</h5>
-            <ItemsList value={content.elements} />
+            <h5>IPCC adaptation options categories:</h5>
+            <ItemsList value={ipcc_category} />
           </>
         )}
-        {content?.sectors?.length > 0 && (
+
+        {!isObservatoryItem && (
           <>
-            <h5>Sectors:</h5>
-            <ItemsList value={content.sectors} />
+            {climate_impacts && climate_impacts?.length > 0 && (
+              <>
+                <h5>Climate impacts:</h5>
+                <ItemsList value={climate_impacts} />
+              </>
+            )}
+
+            {elements && elements?.length > 0 && (
+              <>
+                <h5> Adaptation elements:</h5>
+                <ItemsList value={elements} />
+              </>
+            )}
+
+            {sectors && sectors?.length > 0 && (
+              <>
+                <h5>Sectors:</h5>
+                <ItemsList value={sectors} />
+              </>
+            )}
           </>
         )}
-        {content?.governance_level?.length > 0 && (
+
+        {governance_level && governance_level?.length > 0 && (
           <>
             <h5>Governance level:</h5>
-            <ItemsList value={content.governance_level} join="<br />" />
+            <ItemsList value={governance_level} join="<br />" />
           </>
         )}
-        {content?.funding_programme?.title?.length > 0 && (
+
+        {!isObservatoryItem && (
           <>
-            <h5>Funding Programme:</h5>
-            <span>{content.funding_programme.title}</span>
+            {funding_programme && funding_programme?.title?.length > 0 && (
+              <>
+                <h5>Funding Programme:</h5>
+                <span>{funding_programme.title}</span>
+              </>
+            )}
           </>
         )}
-        {content?.duration && (
+
+        {duration && (
           <>
             <h5>Duration:</h5>
-            <span>{content.duration}</span>
+            <span>{duration}</span>
           </>
         )}
+
         {hasGeoChars && (
           <>
             <h5>Geographic characterisation:</h5>

package/src/helpers/ShareInfo.jsx

@@ -1,13 +1,21 @@
+import { Link } from 'react-router-dom';
+import { useSelector } from 'react-redux';
+import { Button, Icon } from 'semantic-ui-react';
+
 const ShareInfo = (props) => {
+  const currentLang = useSelector((state) => state.intl.locale);
+
   return (
-    <div className="share-info">
-      <a href="/help/share-your-info">
-        <button className="ui button primary icon labeled">
-          Share your information
-          <i aria-hidden="true" className="arrow right icon"></i>
-        </button>
-      </a>
-    </div>
+    <>
+      <div className="share-info">
+        <Link to={`/${currentLang + '/help/share-your-info'}`}>
+          <Button icon primary labelPosition="left">
+            Share your information
+            <Icon name="right arrow" />
+          </Button>
+        </Link>
+      </div>
+    </>
   );
 };
 

package/src/helpers/Utils.jsx

@@ -1,7 +1,14 @@
 import React, { Fragment } from 'react';
 import { UniversalLink } from '@plone/volto/components';
 import config from '@plone/volto/registry';
-import { Segment } from 'semantic-ui-react';
+import { Segment, Image } from 'semantic-ui-react';
+import {
+  CASE_STUDY,
+  PUBICATION_REPORT,
+  ORGANISATION,
+  ADAPTATION_OPTION,
+  ACE_PROJECT,
+} from '@eeacms/volto-cca-policy/helpers/Constants';
 
 export const HTMLField = ({ value, className }) => {
   if (value === null) {
@@ -93,8 +100,16 @@ export const BannerTitle = (props) => {
 
 export const ReferenceInfo = (props) => {
   const { content } = props;
+  const type = content['@type'];
   const { websites, source, contributor_list, other_contributor } = content;
 
+  let source_title;
+  if (type === ADAPTATION_OPTION) {
+    source_title = 'References';
+  } else {
+    source_title = 'Source';
+  }
+
   return websites?.length > 0 ||
     (source && source?.data.length > 0) ||
     contributor_list?.length > 0 ||
@@ -104,11 +119,11 @@ export const ReferenceInfo = (props) => {
 
       {websites?.length > 0 && <LinksList title="Websites:" value={websites} />}
 
-      {content['@type'] !== 'eea.climateadapt.aceproject' && (
+      {type !== ACE_PROJECT && type !== ORGANISATION && (
         <>
           {source && source?.data.length > 0 && (
             <>
-              <h5>Source:</h5>
+              <h5 id="source">{source_title}:</h5>
               <HTMLField value={source} className="source" />
             </>
           )}
@@ -185,6 +200,7 @@ export const PublishedModifiedInfo = (props) => {
 
 export const DocumentsList = (props) => {
   const { content } = props;
+  const type = content['@type'];
   const files = content?.cca_files;
   if (!files || files.length === 0) {
     return null;
@@ -199,13 +215,18 @@ export const DocumentsList = (props) => {
     section_title = content['section_title'];
   }
 
-  if (content['@type'] === 'eea.climateadapt.casestudy') {
+  if (type === CASE_STUDY) {
     section_title = 'Case Studies Documents';
   }
 
-  if (content['@type'] === 'eea.climateadapt.publicationreport') {
+  if (type === PUBICATION_REPORT) {
     section_title = 'Publications and Reports Documents';
   }
+
+  if (type === ORGANISATION) {
+    section_title = 'Organisation Documents';
+  }
+
   return (
     <Segment>
       <h5>
@@ -252,3 +273,34 @@ export const ContentRelatedItems = (props) => {
 
 export const LogoWrapper = ({ logo, children }) =>
   logo ? <div className="has-logo">{children}</div> : children;
+
+export const ItemLogo = (props) => {
+  const { content } = props;
+  const { image, logo, title } = content;
+
+  let logo_image;
+  if (logo) {
+    logo_image = logo;
+  } else if (!logo && image) {
+    logo_image = image;
+  } else {
+    logo_image = null;
+  }
+
+  return (
+    <LogoWrapper logo={logo_image}>
+      <h2>Description</h2>
+      {logo_image && (
+        <Image
+          src={logo_image?.scales?.mini?.download}
+          alt={title}
+          className="db-logo"
+        />
+      )}
+    </LogoWrapper>
+  );
+};
+
+export const isObservatoryURL = (url) => {
+  return url.indexOf('/observatory/++aq++metadata') > -1;
+};

package/src/helpers/index.js

@@ -3,6 +3,7 @@ import config from '@plone/volto/registry';
 import { addHeadersFactory } from '@plone/volto/helpers/Proxy/Proxy';
 import { isArray } from 'lodash';
 import { serializeNodes } from '@plone/volto-slate/editor/render';
+
 export {
   HTMLField,
   ExternalLink,
@@ -13,6 +14,7 @@ export {
   BannerTitle,
   LogoWrapper,
   ContentRelatedItems,
+  ItemLogo,
 } from './Utils';
 export ContentMetadata from './ContentMetadata';
 export ShareInfo from './ShareInfo';

package/src/index.js

@@ -318,138 +318,58 @@ const applyConfig = (config) => {
     },
   ];
 
+  const hideChildren = {
+    hideChildrenFromNavigation: false,
+  };
+
   // mega menu layout settings
   config.settings.menuItemsLayouts = {
     // '*': {
     //   hideChildrenFromNavigation: false,
     // },
-    '/en/eu-policy': {
-      hideChildrenFromNavigation: false,
-    },
-    '/de/eu-policy': {
-      hideChildrenFromNavigation: false,
-    },
-    '/fr/eu-policy': {
-      hideChildrenFromNavigation: false,
-    },
-    '/es/eu-policy': {
-      hideChildrenFromNavigation: false,
-    },
-    '/it/eu-policy': {
-      hideChildrenFromNavigation: false,
-    },
-    '/pl/eu-policy': {
-      hideChildrenFromNavigation: false,
-    },
-    '/en/knowledge-1': {
-      hideChildrenFromNavigation: false,
-    },
-    '/de/knowledge-1': {
-      hideChildrenFromNavigation: false,
-    },
-    '/fr/knowledge-1': {
-      hideChildrenFromNavigation: false,
-    },
-    '/es/knowledge-1': {
-      hideChildrenFromNavigation: false,
-    },
-    '/it/knowledge-1': {
-      hideChildrenFromNavigation: false,
-    },
-    '/pl/knowledge-1': {
-      hideChildrenFromNavigation: false,
-    },
+    '/en/eu-policy': hideChildren,
+    '/de/eu-policy': hideChildren,
+    '/fr/eu-policy': hideChildren,
+    '/es/eu-policy': hideChildren,
+    '/it/eu-policy': hideChildren,
+    '/pl/eu-policy': hideChildren,
+    '/en/knowledge-1': hideChildren,
+    '/de/knowledge-1': hideChildren,
+    '/fr/knowledge-1': hideChildren,
+    '/es/knowledge-1': hideChildren,
+    '/it/knowledge-1': hideChildren,
+    '/pl/knowledge-1': hideChildren,
     // observatory
-    '/en/observatory/about': {
-      hideChildrenFromNavigation: false,
-    },
-    '/de/observatory/about': {
-      hideChildrenFromNavigation: false,
-    },
-    '/fr/observatory/about': {
-      hideChildrenFromNavigation: false,
-    },
-    '/es/observatory/about': {
-      hideChildrenFromNavigation: false,
-    },
-    '/it/observatory/about': {
-      hideChildrenFromNavigation: false,
-    },
-    '/pl/observatory/about': {
-      hideChildrenFromNavigation: false,
-    },
-    '/en/observatory/policy-context-1': {
-      hideChildrenFromNavigation: false,
-    },
-    '/de/observatory/policy-context-1': {
-      hideChildrenFromNavigation: false,
-    },
-    '/fr/observatory/policy-context-1': {
-      hideChildrenFromNavigation: false,
-    },
-    '/es/observatory/policy-context-1': {
-      hideChildrenFromNavigation: false,
-    },
-    '/it/observatory/policy-context-1': {
-      hideChildrenFromNavigation: false,
-    },
-    '/pl/observatory/policy-context-1': {
-      hideChildrenFromNavigation: false,
-    },
-    '/en/observatory/evidence-on-climate-and-health': {
-      hideChildrenFromNavigation: false,
-    },
-    '/de/observatory/evidence-on-climate-and-health': {
-      hideChildrenFromNavigation: false,
-    },
-    '/fr/observatory/evidence-on-climate-and-health': {
-      hideChildrenFromNavigation: false,
-    },
-    '/es/observatory/evidence-on-climate-and-health': {
-      hideChildrenFromNavigation: false,
-    },
-    '/it/observatory/evidence-on-climate-and-health': {
-      hideChildrenFromNavigation: false,
-    },
-    '/pl/observatory/evidence-on-climate-and-health': {
-      hideChildrenFromNavigation: false,
-    },
-    '/en/observatory/resource-catalogue-1': {
-      hideChildrenFromNavigation: false,
-    },
-    '/de/observatory/resource-catalogue-1': {
-      hideChildrenFromNavigation: false,
-    },
-    '/fr/observatory/resource-catalogue-1': {
-      hideChildrenFromNavigation: false,
-    },
-    '/es/observatory/resource-catalogue-1': {
-      hideChildrenFromNavigation: false,
-    },
-    '/it/observatory/resource-catalogue-1': {
-      hideChildrenFromNavigation: false,
-    },
-    '/pl/observatory/resource-catalogue-1': {
-      hideChildrenFromNavigation: false,
-    },
-    '/en/observatory/publications-and-outreach': {
-      hideChildrenFromNavigation: false,
-    },
-    '/de/observatory/publications-and-outreach': {
-      hideChildrenFromNavigation: false,
-    },
-    '/fr/observatory/publications-and-outreach': {
-      hideChildrenFromNavigation: false,
-    },
-    '/es/observatory/publications-and-outreach': {
-      hideChildrenFromNavigation: false,
-    },
-    '/it/observatory/publications-and-outreach': {
-      hideChildrenFromNavigation: false,
-    },
-    '/pl/observatory/publications-and-outreach': {
-      hideChildrenFromNavigation: false,
-    },
+    '/en/observatory/about': hideChildren,
+    '/de/observatory/about': hideChildren,
+    '/fr/observatory/about': hideChildren,
+    '/es/observatory/about': hideChildren,
+    '/it/observatory/about': hideChildren,
+    '/pl/observatory/about': hideChildren,
+    '/en/observatory/policy-context-1': hideChildren,
+    '/de/observatory/policy-context-1': hideChildren,
+    '/fr/observatory/policy-context-1': hideChildren,
+    '/es/observatory/policy-context-1': hideChildren,
+    '/it/observatory/policy-context-1': hideChildren,
+    '/pl/observatory/policy-context-1': hideChildren,
+    '/en/observatory/evidence-on-climate-and-health': hideChildren,
+    '/de/observatory/evidence-on-climate-and-health': hideChildren,
+    '/fr/observatory/evidence-on-climate-and-health': hideChildren,
+    '/es/observatory/evidence-on-climate-and-health': hideChildren,
+    '/it/observatory/evidence-on-climate-and-health': hideChildren,
+    '/pl/observatory/evidence-on-climate-and-health': hideChildren,
+    '/en/observatory/resource-catalogue-1': hideChildren,
+    '/de/observatory/resource-catalogue-1': hideChildren,
+    '/fr/observatory/resource-catalogue-1': hideChildren,
+    '/es/observatory/resource-catalogue-1': hideChildren,
+    '/it/observatory/resource-catalogue-1': hideChildren,
+    '/pl/observatory/resource-catalogue-1': hideChildren,
+    '/en/observatory/publications-and-outreach': hideChildren,
+    '/de/observatory/publications-and-outreach': hideChildren,
+    '/fr/observatory/publications-and-outreach': hideChildren,
+    '/es/observatory/publications-and-outreach': hideChildren,
+    '/it/observatory/publications-and-outreach': hideChildren,
+    '/pl/observatory/publications-and-outreach': hideChildren,
   };
 
   // Custom results

package/theme/globals/views.less

@@ -94,6 +94,12 @@ hr {
   display: flex;
   align-items: flex-start;
   word-break: break-all;
+
+  i.icon {
+    position: relative;
+    top: 4px;
+    margin-right: 5px;
+  }
 }
 
 .db-item-view {