@eeacms/volto-clms-theme 1.0.163 → 1.0.165

package/CHANGELOG.md

@@ -4,6 +4,18 @@ 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).
 
+### [1.0.165](https://github.com/eea/volto-clms-theme/compare/1.0.164...1.0.165) - 19 January 2023
+
+#### :hammer_and_wrench: Others
+
+- CLMS hybrid FAQ view [Unai - [`a56b5ce`](https://github.com/eea/volto-clms-theme/commit/a56b5ced82fe61ebbd80e9af9e5bc70af597b80d)]
+### [1.0.164](https://github.com/eea/volto-clms-theme/compare/1.0.163...1.0.164) - 18 January 2023
+
+#### :hammer_and_wrench: Others
+
+- lint fix [Unai - [`95c026b`](https://github.com/eea/volto-clms-theme/commit/95c026be26ce6c9f6b546f0a281af29f248facfe)]
+- FAQBlockView only taking data from blocks [Unai - [`def427e`](https://github.com/eea/volto-clms-theme/commit/def427e671bd0e2fc1508f286ca728694631f64b)]
+- hybrid FAQBlockView [Unai - [`37ad5a1`](https://github.com/eea/volto-clms-theme/commit/37ad5a181e46e5d44a7e19ad187e3a0912503617)]
 ### [1.0.163](https://github.com/eea/volto-clms-theme/compare/1.0.162...1.0.163) - 17 January 2023
 
 #### :hammer_and_wrench: Others

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-clms-theme",
-  "version": "1.0.163",
+  "version": "1.0.165",
   "description": "volto-clms-theme: Volto theme for CLMS site",
   "main": "src/index.js",
   "author": "CodeSyntax for the European Environment Agency",

package/src/components/Blocks/CclFAQBlock/CclFAQBlockView.jsx

@@ -1,13 +1,16 @@
 import React from 'react';
-import { CclTabs } from '@eeacms/volto-clms-theme/components/CclTab';
+import AnimateHeight from 'react-animate-height';
 import { useDispatch, useSelector } from 'react-redux';
-import { searchContent } from '@plone/volto/actions';
-import config from '@plone/volto/registry';
 import { Accordion, Segment } from 'semantic-ui-react';
+
+import { searchContent } from '@plone/volto/actions';
 import { Icon, UniversalLink } from '@plone/volto/components';
-import AnimateHeight from 'react-animate-height';
-import { StringToHTML } from '@eeacms/volto-clms-theme/components/CclUtils';
+import RenderBlocks from '@plone/volto/components/theme/View/RenderBlocks';
+import { hasBlocksData } from '@plone/volto/helpers';
 import penSVG from '@plone/volto/icons/pen.svg';
+import config from '@plone/volto/registry';
+import { CclTabs } from '@eeacms/volto-clms-theme/components/CclTab';
+// import { StringToHTML } from '@eeacms/volto-clms-theme/components/CclUtils';
 
 const CclFAQBlockView = (props) => {
   const { isEditMode } = props;
@@ -150,9 +153,12 @@ const CclFAQBlockView = (props) => {
                                 duration={500}
                                 height={'auto'}
                               >
-                                <StringToHTML
+                                {/* <StringToHTML
                                   string={item.text ? item.text.data : ''}
-                                />
+                                /> */}
+                                {hasBlocksData(item) && (
+                                  <RenderBlocks content={item} />
+                                )}
                               </AnimateHeight>
                             </Accordion.Content>
                           </Accordion>

package/src/components/CLMSFAQView/CLMSFAQView.jsx

@@ -0,0 +1,20 @@
+import React from 'react';
+
+import RenderBlocks from '@plone/volto/components/theme/View/RenderBlocks';
+
+const CLMSFAQView = (props) => {
+  const { content } = props;
+
+  return (
+    <div className="ccl-container">
+      <>
+        <h1 className="page-title">{content.title}</h1>
+        <div className="faq-detail">
+          <RenderBlocks {...props} />
+        </div>
+      </>
+    </div>
+  );
+};
+
+export default CLMSFAQView;

package/src/index.js

@@ -22,6 +22,7 @@ import ProfileView from './components/CLMSProfileView/CLMSProfileView';
 import SubscriptionView from './components/CLMSSubscriptionView/SubscriptionView';
 import CLMSWorkOpportunityView from '@eeacms/volto-clms-theme/components/CLMSWorkOpportunityView/WorkOpportunityView';
 import CLMSUseCaseView from './components/CLMSUseCasesView/CLMSUseCasesView';
+import CLMSFAQView from './components/CLMSFAQView/CLMSFAQView';
 
 // WIDGET
 import BoundingWidget from './components/Widgets/BoundingWidget';
@@ -63,6 +64,7 @@ const applyConfig = (config) => {
       'eea.meeting.email': CLMSMeetingEmailView,
       WorkOpportunity: CLMSWorkOpportunityView,
       Tender: CLMSWorkOpportunityView,
+      FAQ: CLMSFAQView,
     },
   };
   config.blocks = {