@eeacms/volto-slate-footnote 4.0.4 → 4.0.5

package/CHANGELOG.md

@@ -4,8 +4,14 @@ 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).
 
+#### [4.0.5](https://github.com/eea/volto-slate-footnote/compare/4.0.4...4.0.5)
+
+- Allow other block types to define footnotes - refs #148688 [`12f5920`](https://github.com/eea/volto-slate-footnote/commit/12f592019bbc37d71c14a64387ef9fbaf1828adc)
+
 #### [4.0.4](https://github.com/eea/volto-slate-footnote/compare/4.0.3...4.0.4)
 
+> 3 January 2022
+
 
 #### [4.0.3](https://github.com/eea/volto-slate-footnote/compare/4.0.2...4.0.3)
 

package/Jenkinsfile

@@ -4,7 +4,7 @@ pipeline {
   environment {
         GIT_NAME = "volto-slate-footnote"
         NAMESPACE = "@eeacms"
-        SONARQUBE_TAGS = "volto.eea.europa.eu,biodiversity.europa.eu,www.eea.europa.eu-ims,climate-energy.eea.europa.eu,sustainability.eionet.europa.eu,forest.eea.europa.eu,clms.land.copernicus.eu,industry.eea.europa.eu,water.europa.eu-freshwater"
+        SONARQUBE_TAGS = "volto.eea.europa.eu,biodiversity.europa.eu,www.eea.europa.eu-ims,climate-energy.eea.europa.eu,sustainability.eionet.europa.eu,forest.eea.europa.eu,clms.land.copernicus.eu,industry.eea.europa.eu,water.europa.eu-freshwater,demo-www.eea.europa.eu,clmsdemo.devel6cph.eea.europa.eu"
         DEPENDENCIES = "volto-slate:asDefault"
     }
 
@@ -184,10 +184,10 @@ pipeline {
             unstash "xunit-reports"
             unstash "cypress-coverage"
             def scannerHome = tool 'SonarQubeScanner';
-            def nodeJS = tool 'NodeJS11';
+            def nodeJS = tool 'NodeJS';
             withSonarQubeEnv('Sonarqube') {
               sh '''sed -i "s#/opt/frontend/my-volto-project/src/addons/${GIT_NAME}/##g" xunit-reports/coverage/lcov.info'''
-              sh "export PATH=$PATH:${scannerHome}/bin:${nodeJS}/bin; sonar-scanner -Dsonar.javascript.lcov.reportPaths=./xunit-reports/coverage/lcov.info,./cypress-coverage/coverage/lcov.info -Dsonar.sources=./src -Dsonar.projectKey=$GIT_NAME-$BRANCH_NAME -Dsonar.projectVersion=$BRANCH_NAME-$BUILD_NUMBER"
+              sh "export PATH=${scannerHome}/bin:${nodeJS}/bin:$PATH; sonar-scanner -Dsonar.javascript.lcov.reportPaths=./xunit-reports/coverage/lcov.info,./cypress-coverage/coverage/lcov.info -Dsonar.sources=./src -Dsonar.projectKey=$GIT_NAME-$BRANCH_NAME -Dsonar.projectVersion=$BRANCH_NAME-$BUILD_NUMBER"
               sh '''try=2; while [ \$try -gt 0 ]; do curl -s -XPOST -u "${SONAR_AUTH_TOKEN}:" "${SONAR_HOST_URL}api/project_tags/set?project=${GIT_NAME}-${BRANCH_NAME}&tags=${SONARQUBE_TAGS},${BRANCH_NAME}" > set_tags_result; if [ \$(grep -ic error set_tags_result ) -eq 0 ]; then try=0; else cat set_tags_result; echo "... Will retry"; sleep 60; try=\$(( \$try - 1 )); fi; done'''
             }
           }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-slate-footnote",
-  "version": "4.0.4",
+  "version": "4.0.5",
   "description": "volto-slate-footnote: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",

package/src/constants.js

@@ -1 +1,2 @@
 export const FOOTNOTE = 'footnote';
+export const SLATE = 'slate';

package/src/editor/FootnoteEditor.jsx

@@ -11,6 +11,7 @@ import { Node } from 'slate';
 import { useSelector } from 'react-redux';
 import { isEmpty } from 'lodash';
 import { getAllBlocksAndSlateFields } from '@eeacms/volto-slate-footnote/editor/utils';
+import config from '@plone/volto/registry';
 
 const FootnoteEditor = (props) => {
   const {
@@ -66,7 +67,7 @@ const FootnoteEditor = (props) => {
   // add label and value for the multi search widget
   // flatten blocks to add all extra in the list
   flatAllBlocks
-    .filter((b) => b['@type'] === 'slate')
+    .filter((b) => config.settings.blocksWithFootnotes.includes(b['@type']))
     .forEach(({ value }) => {
       if (!value) return;
 

package/src/editor/utils.js

@@ -118,7 +118,7 @@ export const makeFootnoteListOfUniqueItems = (blocks) => {
   let notesObjResult = {};
 
   blocks
-    .filter((b) => b['@type'] === 'slate')
+    .filter((b) => config.settings.blocksWithFootnotes.includes(b['@type']))
     .forEach(({ value }) => {
       if (!value) return;
       // Node.elements(value[0]) returns an iterable generator of nodes

package/src/index.js

@@ -3,7 +3,7 @@ import codeSVG from '@plone/volto/icons/blog-entry.svg';
 import FootnotesBlockView from './Blocks/Footnote/FootnotesBlockView';
 import FootnotesBlockEdit from './Blocks/Footnote/FootnotesBlockEdit';
 import FootnotesBlockSchema from './Blocks/Footnote/FootnotesBlockSchema';
-import { FOOTNOTE } from './constants';
+import { FOOTNOTE, SLATE } from './constants';
 import installFootnoteEditor from './editor';
 import SearchWidget from '@eeacms/volto-slate-footnote/editor/MultiSelectSearchWidget';
 
@@ -36,5 +36,10 @@ export default function install(config) {
   config.widgets.widget.searchInput = SearchWidget;
   config = installFootnoteEditor(config);
 
+  config.settings.blocksWithFootnotes = [
+    ...(config.settings.blocksWithFootnotes || []),
+    SLATE,
+  ];
+
   return config;
 }