@eeacms/volto-cca-policy 0.1.76 → 0.1.77

package/CHANGELOG.md

@@ -4,6 +4,30 @@ 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.77](https://github.com/eea/volto-cca-policy/compare/0.1.76...0.1.77) - 19 February 2024
+
+#### :bug: Bug Fixes
+
+- fix: typo [kreafox - [`b5dc1fe`](https://github.com/eea/volto-cca-policy/commit/b5dc1fe0fa28ff05dc2482d23fa7b0c4b27941de)]
+- fix: add RichTextWidget override - refs: #265406 [kreafox - [`e25f6f0`](https://github.com/eea/volto-cca-policy/commit/e25f6f092cc15495ec2d6f3bc4a29caeda68b3eb)]
+
+#### :nail_care: Enhancements
+
+- change: update search facets [kreafox - [`41c9e3b`](https://github.com/eea/volto-cca-policy/commit/41c9e3bf18d033334c43ebdaad015bed8304890b)]
+- change: update search facets [kreafox - [`fee246b`](https://github.com/eea/volto-cca-policy/commit/fee246b38965baaf38f0c9b7da5c0d48d91f1af8)]
+- change: update mission projects facets [kreafox - [`10bbb14`](https://github.com/eea/volto-cca-policy/commit/10bbb14a12d8450295470536170979874bf5d0f5)]
+- change: facets order [kreafox - [`ad7a023`](https://github.com/eea/volto-cca-policy/commit/ad7a023c05933d855329dbe9c1638ec24aaab2ab)]
+- change: update mission stories search [kreafox - [`6bf68a6`](https://github.com/eea/volto-cca-policy/commit/6bf68a6ddc19ba13ea205c18dc84e5fd009f8267)]
+- change: add Title block on database items view [kreafox - [`a59c677`](https://github.com/eea/volto-cca-policy/commit/a59c677143d2817f4d258c855f3adab8b4fb5ca2)]
+
+#### :hammer_and_wrench: Others
+
+- test: increase coverage [kreafox - [`d32e592`](https://github.com/eea/volto-cca-policy/commit/d32e592a1274748cae3b3b39ba23c2a51e93a4f9)]
+- test: reduce duplicated code [kreafox - [`97319a4`](https://github.com/eea/volto-cca-policy/commit/97319a45b87afe2d35f01f8618b8746c37718f88)]
+- test: remove unused import [kreafox - [`f393b42`](https://github.com/eea/volto-cca-policy/commit/f393b42bfbda103c290be658abf510fd5902f226)]
+- test: reduce duplicated code [kreafox - [`037c3cb`](https://github.com/eea/volto-cca-policy/commit/037c3cbd5f82acec32959af96a374707b4e1bf02)]
+- test: update volto version in Jenkinsfile [kreafox - [`43e8b76`](https://github.com/eea/volto-cca-policy/commit/43e8b7628e85cdf1965b8c88b90660e585811db4)]
+- test: update tests for Database items view [kreafox - [`b611f0f`](https://github.com/eea/volto-cca-policy/commit/b611f0fea373f041ed196bad096fe7ac48df65c7)]
 ### [0.1.76](https://github.com/eea/volto-cca-policy/compare/0.1.75...0.1.76) - 16 February 2024
 
 #### :nail_care: Enhancements

package/package.json

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

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

@@ -5,58 +5,48 @@ import {
   LinksList,
   PublishedModifiedInfo,
   ShareInfo,
+  BannerTitle,
 } from '@eeacms/volto-cca-policy/helpers';
 import { Grid } from 'semantic-ui-react';
 
+function createDataField(type, field, section, title) {
+  return {
+    type,
+    field,
+    section,
+    title,
+  };
+}
+
 const dataDisplay = [
-  {
-    type: 'other',
-    field: 'category',
-    section: 'ao_category',
-    title: 'Category',
-  },
-  {
-    type: 'other',
-    field: 'ipcc_category',
-    section: 'ipcc_category',
-    title: 'IPCC categories',
-  },
-  {
-    type: 'HTMLField',
-    field: 'stakeholder_participation',
-    section: 'stakeholder_participation',
-    title: 'Stakeholder participation',
-  },
-  {
-    type: 'HTMLField',
-    field: 'success_limitations',
-    section: 'success_factors',
-    title: 'Success and Limiting Factors',
-  },
-  {
-    type: 'HTMLField',
-    field: 'cost_benefit',
-    section: 'costs_benefits',
-    title: 'Costs and Benefits',
-  },
-  {
-    type: 'HTMLField',
-    field: 'legal_aspects',
-    section: 'legal',
-    title: 'Legal Aspects',
-  },
-  {
-    type: 'HTMLField',
-    field: 'implementation_time',
-    section: 'implementation',
-    title: 'Implementation Time',
-  },
-  {
-    type: 'HTMLField',
-    field: 'lifetime',
-    section: 'life_time',
-    title: 'Life Time',
-  },
+  createDataField('other', 'category', 'ao_category', 'Category'),
+  createDataField('other', 'ipcc_category', 'ipcc_category', 'IPCC categories'),
+  createDataField(
+    'HTMLField',
+    'stakeholder_participation',
+    'stakeholder_participation',
+    'Stakeholder participation',
+  ),
+  createDataField(
+    'HTMLField',
+    'success_limitations',
+    'success_factors',
+    'Success and Limiting Factors',
+  ),
+  createDataField(
+    'HTMLField',
+    'cost_benefit',
+    'costs_benefits',
+    'Costs and Benefits',
+  ),
+  createDataField('HTMLField', 'legal_aspects', 'legal', 'Legal Aspects'),
+  createDataField(
+    'HTMLField',
+    'implementation_time',
+    'implementation',
+    'Implementation Time',
+  ),
+  createDataField('HTMLField', 'lifetime', 'life_time', 'Life Time'),
 ];
 
 const findSection = (title) => {
@@ -117,6 +107,8 @@ function AdaptationOptionView(props) {
 
   return (
     <div className="adaptation-option-view">
+      <BannerTitle content={content} type="Adaptation Option" />
+
       <div className="ui container">
         <Grid columns="12">
           <div className="row">
@@ -126,8 +118,6 @@ function AdaptationOptionView(props) {
               computer={9}
               className="col-left"
             >
-              <div className="ui label">Adaptation option</div>
-              <h1>{content.title}</h1>
               <HTMLField
                 value={content.long_description}
                 className="long_description"

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

@@ -5,6 +5,15 @@ import '@testing-library/jest-dom/extend-expect';
 import { Provider } from 'react-intl-redux';
 import AdaptationOptionView from './AdaptationOptionView';
 import renderer from 'react-test-renderer';
+import config from '@plone/volto/registry';
+
+config.blocks = {
+  blocksConfig: {
+    title: {
+      view: () => <div>Title Block Component</div>,
+    },
+  },
+};
 
 const mockStore = configureStore();
 

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

@@ -6,6 +6,7 @@ import {
   PublishedModifiedInfo,
   DocumentsList,
   ShareInfo,
+  BannerTitle,
 } from '@eeacms/volto-cca-policy/helpers';
 import { Grid } from 'semantic-ui-react';
 
@@ -250,6 +251,8 @@ function CaseStudyView(props) {
 
   return (
     <div className="case-study-view">
+      <BannerTitle content={content} type="Case Studies" />
+
       <div className="ui container">
         <Grid columns="12">
           <div className="row">
@@ -259,8 +262,6 @@ function CaseStudyView(props) {
               computer={9}
               className="col-left"
             >
-              <div className="ui label">Case studies</div>
-              <h1>{content.title}</h1>
               <PrimaryPhoto {...props} />
 
               <HTMLField

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

@@ -5,6 +5,15 @@ import '@testing-library/jest-dom/extend-expect';
 import { Provider } from 'react-intl-redux';
 import CaseStudyView from './CaseStudyView';
 import renderer from 'react-test-renderer';
+import config from '@plone/volto/registry';
+
+config.blocks = {
+  blocksConfig: {
+    title: {
+      view: () => <div>Title Block Component</div>,
+    },
+  },
+};
 
 const mockStore = configureStore();
 

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

@@ -5,6 +5,7 @@ import {
   LinksList,
   PublishedModifiedInfo,
   ShareInfo,
+  BannerTitle,
 } from '@eeacms/volto-cca-policy/helpers';
 import { Grid } from 'semantic-ui-react';
 
@@ -35,6 +36,7 @@ function GuidanceView(props) {
 
   return (
     <div className="guidance-view">
+      <BannerTitle content={content} type="Guidance Document" />
       <div className="ui container">
         <Grid columns="12">
           <div className="row">
@@ -44,9 +46,6 @@ function GuidanceView(props) {
               computer={9}
               className="col-left"
             >
-              <div className="ui label">Guidance Document</div>
-              <h1>{content.title}</h1>
-              <hr />
               <h4>Description:</h4>
               <HTMLField
                 value={content.long_description}

package/src/components/theme/Views/GuidanceView.test.jsx

@@ -5,6 +5,15 @@ import '@testing-library/jest-dom/extend-expect';
 import { Provider } from 'react-intl-redux';
 import GuidanceView from './GuidanceView';
 import renderer from 'react-test-renderer';
+import config from '@plone/volto/registry';
+
+config.blocks = {
+  blocksConfig: {
+    title: {
+      view: () => <div>Title Block Component</div>,
+    },
+  },
+};
 
 const mockStore = configureStore();
 

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

@@ -5,6 +5,7 @@ import {
   LinksList,
   PublishedModifiedInfo,
   ShareInfo,
+  BannerTitle,
 } from '@eeacms/volto-cca-policy/helpers';
 import { Grid } from 'semantic-ui-react';
 
@@ -13,6 +14,8 @@ function IndicatorView(props) {
 
   return (
     <div className="indicator-view">
+      <BannerTitle content={content} type="Indicator" />
+
       <div className="ui container">
         <Grid columns="12">
           <div className="row">
@@ -22,8 +25,6 @@ function IndicatorView(props) {
               computer={9}
               className="col-left"
             >
-              <div className="ui label">Indicator</div>
-              <h1>{content.title}</h1>
               <h4>Description</h4>
               <HTMLField
                 value={content.long_description}

package/src/components/theme/Views/IndicatorView.test.jsx

@@ -5,6 +5,15 @@ import '@testing-library/jest-dom/extend-expect';
 import { Provider } from 'react-intl-redux';
 import IndicatorView from './IndicatorView';
 import renderer from 'react-test-renderer';
+import config from '@plone/volto/registry';
+
+config.blocks = {
+  blocksConfig: {
+    title: {
+      view: () => <div>Title Block Component</div>,
+    },
+  },
+};
 
 const mockStore = configureStore();
 

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

@@ -5,6 +5,7 @@ import {
   LinksList,
   PublishedModifiedInfo,
   ShareInfo,
+  BannerTitle,
 } from '@eeacms/volto-cca-policy/helpers';
 import { Grid } from 'semantic-ui-react';
 
@@ -13,6 +14,8 @@ function InformationPortalView(props) {
 
   return (
     <div className="information-portal-view">
+      <BannerTitle content={content} type="Information Portal" />
+
       <div className="ui container">
         <Grid columns="12">
           <div className="row">
@@ -22,9 +25,7 @@ function InformationPortalView(props) {
               computer={9}
               className="col-left"
             >
-              <div className="ui label">Information Portal</div>
-              <h1>{content.title}</h1>
-              <h4>Description</h4>
+              <h4>Description:</h4>
               <HTMLField
                 value={content.long_description}
                 className="long_description"

package/src/components/theme/Views/InformationPortalView.test.jsx

@@ -5,6 +5,15 @@ import '@testing-library/jest-dom/extend-expect';
 import { Provider } from 'react-intl-redux';
 import InformationPortalView from './InformationPortalView';
 import renderer from 'react-test-renderer';
+import config from '@plone/volto/registry';
+
+config.blocks = {
+  blocksConfig: {
+    title: {
+      view: () => <div>Title Block Component</div>,
+    },
+  },
+};
 
 const mockStore = configureStore();
 

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

@@ -1,5 +1,4 @@
-import React from 'react';
-import { Fragment } from 'react';
+import React, { Fragment } from 'react';
 import { UniversalLink } from '@plone/volto/components';
 import {
   HTMLField,
@@ -7,6 +6,7 @@ import {
   LinksList,
   PublishedModifiedInfo,
   ShareInfo,
+  BannerTitle,
 } from '@eeacms/volto-cca-policy/helpers';
 import { Grid } from 'semantic-ui-react';
 
@@ -27,6 +27,8 @@ function OrganisationView(props) {
 
   return (
     <div className="organisation-view">
+      <BannerTitle content={content} type="Organisation" />
+
       <div className="ui container">
         <Grid columns="12">
           <div className="row">
@@ -36,15 +38,15 @@ function OrganisationView(props) {
               computer={9}
               className="col-left"
             >
-              <div className="ui label">Organisation</div>
-              <h1>{content.title}</h1>
-              <h4>Description:</h4>
-              <HTMLField
-                value={content.long_description}
-                className="long_description"
-              />
-              <hr />
-              <h4>Reference information</h4>
+              <div>
+                <h4>Description:</h4>
+                <HTMLField
+                  value={content.long_description}
+                  className="long_description"
+                />
+                <hr />
+                <h4>Reference information</h4>
+              </div>
 
               {content?.websites?.length > 0 && (
                 <LinksList title="Websites:" value={content.websites} />

package/src/components/theme/Views/OrganisationView.test.jsx

@@ -5,6 +5,15 @@ import '@testing-library/jest-dom/extend-expect';
 import { Provider } from 'react-intl-redux';
 import OrganisationView from './OrganisationView';
 import renderer from 'react-test-renderer';
+import config from '@plone/volto/registry';
+
+config.blocks = {
+  blocksConfig: {
+    title: {
+      view: () => <div>Title Block Component</div>,
+    },
+  },
+};
 
 const mockStore = configureStore();
 

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

@@ -7,11 +7,34 @@ import {
   ShareInfo,
 } from '@eeacms/volto-cca-policy/helpers';
 import { Grid } from 'semantic-ui-react';
+import config from '@plone/volto/registry';
 
 function ProjectView(props) {
   const { content } = props;
+  const {
+    blocks: { blocksConfig },
+  } = config;
+  const TitleBlockView = blocksConfig?.title?.view;
+
   return (
     <div className="project-view">
+      <TitleBlockView
+        {...props}
+        data={{
+          info: [{ description: '' }],
+          hideContentType: true,
+          hideCreationDate: true,
+          hideModificationDate: true,
+          hidePublishingDate: true,
+          hideDownloadButton: true,
+          hideShareButton: false,
+          subtitle: 'Project',
+        }}
+        metadata={{
+          ...content,
+          title: content.title + ' (' + content.acronym + ')',
+        }}
+      />
       <div className="ui container">
         <Grid columns="12">
           <div className="row">
@@ -21,10 +44,6 @@ function ProjectView(props) {
               computer={9}
               className="col-left"
             >
-              <div className="ui label">Project</div>
-              <h1>
-                {content.title} ({content.acronym})
-              </h1>
               <h4>Description:</h4>
               <HTMLField
                 value={content.long_description}

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

@@ -5,6 +5,15 @@ import '@testing-library/jest-dom/extend-expect';
 import { Provider } from 'react-intl-redux';
 import ProjectView from './ProjectView';
 import renderer from 'react-test-renderer';
+import config from '@plone/volto/registry';
+
+config.blocks = {
+  blocksConfig: {
+    title: {
+      view: () => <div>Title Block Component</div>,
+    },
+  },
+};
 
 const mockStore = configureStore();
 

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

@@ -5,6 +5,7 @@ import {
   DocumentsList,
   ShareInfo,
   ReferenceInfo,
+  BannerTitle,
 } from '@eeacms/volto-cca-policy/helpers';
 import { Grid } from 'semantic-ui-react';
 
@@ -13,6 +14,8 @@ function PublicationReportView(props) {
 
   return (
     <div className="publication-report-view">
+      <BannerTitle content={content} type="Publications and Report" />
+
       <div className="ui container">
         <Grid columns="12">
           <div className="row">
@@ -22,8 +25,6 @@ function PublicationReportView(props) {
               computer={9}
               className="col-left"
             >
-              <div className="ui label">Publications and Reports</div>
-
               <ReferenceInfo content={content} />
               <PublishedModifiedInfo {...props} />
               <ShareInfo {...props} />

package/src/components/theme/Views/PublicationReportView.test.jsx

@@ -5,6 +5,15 @@ import '@testing-library/jest-dom/extend-expect';
 import { Provider } from 'react-intl-redux';
 import PublicationReportView from './PublicationReportView';
 import renderer from 'react-test-renderer';
+import config from '@plone/volto/registry';
+
+config.blocks = {
+  blocksConfig: {
+    title: {
+      view: () => <div>Title Block Component</div>,
+    },
+  },
+};
 
 const mockStore = configureStore();
 

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

@@ -3,13 +3,17 @@ import {
   ContentMetadata,
   PublishedModifiedInfo,
   ReferenceInfo,
+  BannerTitle,
 } from '@eeacms/volto-cca-policy/helpers';
 import { Grid } from 'semantic-ui-react';
 
 function ToolView(props) {
   const { content } = props;
+
   return (
     <div className="tool-view">
+      <BannerTitle content={content} type="Tools" />
+
       <div className="ui container">
         <Grid columns="12">
           <div className="row">
@@ -19,8 +23,6 @@ function ToolView(props) {
               computer={9}
               className="col-left"
             >
-              <div className="ui label">Tools</div>
-
               <ReferenceInfo content={content} />
 
               <PublishedModifiedInfo {...props} />

package/src/components/theme/Views/ToolView.test.jsx

@@ -5,6 +5,15 @@ import '@testing-library/jest-dom/extend-expect';
 import { Provider } from 'react-intl-redux';
 import ToolView from './ToolView';
 import renderer from 'react-test-renderer';
+import config from '@plone/volto/registry';
+
+config.blocks = {
+  blocksConfig: {
+    title: {
+      view: () => <div>Title Block Component</div>,
+    },
+  },
+};
 
 const mockStore = configureStore();
 

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

@@ -5,11 +5,13 @@ import {
   ExternalLink,
   LinksList,
   ShareInfo,
+  BannerTitle,
 } from '@eeacms/volto-cca-policy/helpers';
 import { Grid } from 'semantic-ui-react';
 
 function VideoView(props) {
   const { content } = props;
+
   const share_eea = ['https://cmshare.eea.eu', 'shareit.eea.europa.eu'];
   const is_cmshare_video = share_eea.some((domain) =>
     content.embed_url.includes(domain),
@@ -25,6 +27,8 @@ function VideoView(props) {
 
   return (
     <div className="video-view">
+      <BannerTitle content={content} type="Video" />
+
       <div className="ui container">
         <Grid columns="12">
           <div className="row">
@@ -34,8 +38,6 @@ function VideoView(props) {
               computer={9}
               className="col-left"
             >
-              <div className="ui label">Video</div>
-              <h1>{content.title}</h1>
               <HTMLField
                 value={content.long_description}
                 className="long_description"

package/src/components/theme/Views/VideoView.test.jsx

@@ -5,6 +5,15 @@ import '@testing-library/jest-dom/extend-expect';
 import { Provider } from 'react-intl-redux';
 import VideoView from './ToolView';
 import renderer from 'react-test-renderer';
+import config from '@plone/volto/registry';
+
+config.blocks = {
+  blocksConfig: {
+    title: {
+      view: () => <div>Title Block Component</div>,
+    },
+  },
+};
 
 const mockStore = configureStore();
 

package/src/customizations/volto/components/theme/Widgets/RichTextWidget.jsx

@@ -0,0 +1,20 @@
+// Original: https://github.com/plone/volto/blob/16.x.x/src/components/theme/Widgets/RichTextWidget.jsx
+// Fixed 'dangerouslySetInnerHTML' did not match. Server: "" Client: "<p>This is my paragraph.</p>" error
+// replaced <p> to <div>, the value can already be wrapped in <p> and nested <p> is invalid HTML
+
+import React from 'react';
+import cx from 'classnames';
+
+const RichTextWidget = ({ value, className }) =>
+  value ? (
+    <div
+      className={cx(className, 'richtext', 'widget')}
+      dangerouslySetInnerHTML={{
+        __html: value.data,
+      }}
+    />
+  ) : (
+    ''
+  );
+
+export default RichTextWidget;

package/src/helpers/Utils.jsx

@@ -1,4 +1,5 @@
 import { UniversalLink } from '@plone/volto/components';
+import config from '@plone/volto/registry';
 
 export const HTMLField = ({ value, className }) => {
   if (value === null) {
@@ -68,11 +69,37 @@ export const LinksList = (props) => {
   }
 };
 
+export const BannerTitle = (props) => {
+  const { content, type } = props;
+  const {
+    blocks: { blocksConfig },
+  } = config;
+  const TitleBlockView = blocksConfig?.title?.view;
+
+  return (
+    <>
+      <TitleBlockView
+        {...props}
+        data={{
+          info: [{ description: '' }],
+          hideContentType: true,
+          hideCreationDate: true,
+          hideModificationDate: true,
+          hidePublishingDate: true,
+          hideDownloadButton: true,
+          hideShareButton: false,
+          subtitle: type,
+        }}
+        metadata={content}
+      />
+    </>
+  );
+};
+
 export const ReferenceInfo = (props) => {
   const { content } = props;
   return (
     <>
-      <h1>{content.title}</h1>
       <h4>Description</h4>
       <HTMLField
         value={content.long_description}

package/src/helpers/index.js

@@ -10,6 +10,7 @@ export {
   LinksList,
   DocumentsList,
   ReferenceInfo,
+  BannerTitle,
 } from './Utils';
 export ContentMetadata from './ContentMetadata';
 export ShareInfo from './ShareInfo';

package/src/search/mission_projects/facets-projects.js

@@ -1,21 +1,33 @@
 import { multiTermFacet } from '@eeacms/search';
-
-import globalSearchBaseConfig from '@eeacms/volto-globalsearch/config/global-search-base-config.js';
+import {
+  include_archived,
+  objectProvides,
+  language,
+  issued_date,
+  geographic_countries,
+} from './../common';
 
 const facets = [
-  ...globalSearchBaseConfig.facets,
   multiTermFacet({
-    field: 'cca_adaptation_sectors.keyword',
+    field: 'cca_funding_programme.keyword',
     isFilterable: false,
     isMulti: true,
-    label: 'Sectors',
+    label: 'Funding Programme',
+    iconsFamily: 'Funding Programme',
     alwaysVisible: false,
   }),
   multiTermFacet({
     field: 'cca_climate_impacts.keyword',
     isFilterable: false,
     isMulti: true,
-    label: 'Climate impacts',
+    label: 'Climate Impacts',
+    alwaysVisible: false,
+  }),
+  multiTermFacet({
+    field: 'cca_adaptation_sectors.keyword',
+    isFilterable: false,
+    isMulti: true,
+    label: 'Adaptation Sectors',
     alwaysVisible: false,
   }),
   multiTermFacet({
@@ -25,6 +37,11 @@ const facets = [
     label: 'Adaptation Elements',
     alwaysVisible: false,
   }),
+  geographic_countries,
+  include_archived,
+  issued_date,
+  language,
+  objectProvides,
 ];
 
 export default facets;

package/src/search/mission_stories/facets-stories.js

@@ -3,53 +3,45 @@ import { multiTermFacet } from '@eeacms/search';
 import globalSearchBaseConfig from '@eeacms/volto-globalsearch/config/global-search-base-config.js';
 
 const facets = [
-  ...globalSearchBaseConfig.facets,
-  // multiTermFacet({
-  //   field: 'spatial',
-  //   isFilterable: false,
-  //   isMulti: true,
-  //   label: 'Country',
-  //   iconsFamily: 'Country',
-  //   alwaysVisible: false,
-  // }),
   multiTermFacet({
-    field: 'cca_adaptation_sectors.keyword',
+    field: 'cca_climate_impacts.keyword',
     isFilterable: false,
     isMulti: true,
-    label: 'Sectors',
-    iconsFamily: 'Sectors',
+    label: 'Climate Impacts',
+    iconsFamily: 'Climate Impacts',
     alwaysVisible: false,
   }),
   multiTermFacet({
-    field: 'key_system.keyword',
+    field: 'cca_adaptation_sectors.keyword',
     isFilterable: false,
     isMulti: true,
-    label: 'Key System',
-    iconsFamily: 'Key System',
+    label: 'Adaptation Sectors',
+    iconsFamily: 'Adaptation Sectors',
     alwaysVisible: false,
   }),
   multiTermFacet({
-    field: 'climate_threats.keyword',
+    field: 'key_system.keyword',
     isFilterable: false,
     isMulti: true,
-    label: 'Hazard Type',
-    iconsFamily: 'Hazard Type',
+    label: 'Key Community Systems',
+    iconsFamily: 'Key Community Systems',
     alwaysVisible: false,
   }),
+  ...globalSearchBaseConfig.facets,
   multiTermFacet({
-    field: 'cca_climate_impacts.keyword',
+    field: 'cca_funding_programme.keyword',
     isFilterable: false,
     isMulti: true,
-    label: 'Climate Impacts',
-    iconsFamily: 'Climate Impacts',
+    label: 'Funding Programme',
+    iconsFamily: 'Funding Programme',
     alwaysVisible: false,
   }),
   multiTermFacet({
-    field: 'cca_funding_programme.keyword',
+    field: 'climate_threats.keyword',
     isFilterable: false,
     isMulti: true,
-    label: 'Funding Programme',
-    iconsFamily: 'Funding Programme',
+    label: 'Hazard Type',
+    iconsFamily: 'Hazard Type',
     alwaysVisible: false,
   }),
 ];