Merge pull request #66 from eea/develop

Develop
eea · Mar 28, 2024 · 0386fe6 · 0386fe6
2 parents cc5e9ac + 5a22318
commit 0386fe6
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 43 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,15 +4,25 @@ 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).
 
+### [6.3.0](https://github.com/eea/volto-slate-footnote/compare/6.2.3...6.3.0) - 27 March 2024
+
+#### :hammer_and_wrench: Others
+
+- Update package.json [ichim-david - [`497b720`](https://github.com/eea/volto-slate-footnote/commit/497b720a79a9debff93b677d7289de3f2766a9ea)]
+- (fix): Make tabs open when footnote in it  #63 from eea/table-and-tabs [ichim-david - [`bcd71a4`](https://github.com/eea/volto-slate-footnote/commit/bcd71a441bdbf28927cbac8a50094fac4606f58d)]
+- Update extensions.js [dobri1408 - [`1245061`](https://github.com/eea/volto-slate-footnote/commit/124506189082d04bcf7d4c47efb4be7b8381cb09)]
+- fix eslint [Dobricean Ioan Dorian - [`f11cd5e`](https://github.com/eea/volto-slate-footnote/commit/f11cd5ed4063e648741bc583f5c20b14c73fba66)]
+- fix issue in table [Dobricean Ioan Dorian - [`3f8a31a`](https://github.com/eea/volto-slate-footnote/commit/3f8a31afbbb2917d02ceb831e7be46ce7f69e893)]
+- open tab if footnote in it [Dobricean Ioan Dorian - [`191c39a`](https://github.com/eea/volto-slate-footnote/commit/191c39aef5f03649db8cdd170afdee1ca17c1392)]
 ### [6.2.3](https://github.com/eea/volto-slate-footnote/compare/6.2.2...6.2.3) - 6 March 2024
 
 #### :bug: Bug Fixes
 
+- fix(slate-notes): crash when hovering over notes due to faulty ref initialization #64 from eea/develop [ichim-david - [`cc5e9ac`](https://github.com/eea/volto-slate-footnote/commit/cc5e9ac269f324e5d35117b348ebf41f93f34bfa)]
 - fix: Refs#265202 - footnotes hover crash [Claudia Ifrim - [`71e236d`](https://github.com/eea/volto-slate-footnote/commit/71e236df5785a0878a243658601030f3d7e670c9)]
 
 #### :hammer_and_wrench: Others
 
-- Add Sonarqube tag using insitu-frontend addons list [EEA Jenkins - [`aa335f9`](https://github.com/eea/volto-slate-footnote/commit/aa335f9eedd9d994b6fbceb57102d848dbdbae15)]
 ### [6.2.2](https://github.com/eea/volto-slate-footnote/compare/6.2.1...6.2.2) - 20 January 2024
 
 #### :hammer_and_wrench: Others
@@ -37,15 +47,9 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 #### :house: Internal changes
 
-- chore: [JENKINS] Refactor automated testing [valentinab25 - [`5a5e1ad`](https://github.com/eea/volto-slate-footnote/commit/5a5e1adf997af84e93a4015dc66b7299abba0874)]
 
 #### :hammer_and_wrench: Others
 
-- test: [JENKINS] Use java17 for sonarqube scanner [valentinab25 - [`af6d78f`](https://github.com/eea/volto-slate-footnote/commit/af6d78f60dd040fe61ebb225f4a689ac21ffb55c)]
-- test: [JENKINS] Run cypress in started frontend container [valentinab25 - [`7f4c07f`](https://github.com/eea/volto-slate-footnote/commit/7f4c07f1fc2e9893d1f925152a473855a7e0f064)]
-- test: [JENKINS] Add cpu limit on cypress docker [valentinab25 - [`0670217`](https://github.com/eea/volto-slate-footnote/commit/0670217cca01571e8a3bd64ee3d85bb53ce447be)]
-- test: [JENKINS] Increase shm-size to cypress docker [valentinab25 - [`ec08749`](https://github.com/eea/volto-slate-footnote/commit/ec08749f9547d2c133b2174ab8d60cf2bdb1b23a)]
-- test: [JENKINS] Improve cypress time [valentinab25 - [`237e6a3`](https://github.com/eea/volto-slate-footnote/commit/237e6a331e3608aa35d1c93a03c435daf330c2bd)]
 ### [6.1.8](https://github.com/eea/volto-slate-footnote/compare/6.1.7...6.1.8) - 22 October 2023
 
 #### :house: Internal changes
@@ -115,25 +119,17 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 #### :house: Internal changes
 
-- chore: [JENKINS] Deprecate circularity website [valentinab25 - [`ded882a`](https://github.com/eea/volto-slate-footnote/commit/ded882a1ca1183c2ba74ff4246111123ee36e6cb)]
 
 #### :hammer_and_wrench: Others
 
 - test: jest should look for addons in node_modules Refs #253277 [valentinab25 - [`3e0749c`](https://github.com/eea/volto-slate-footnote/commit/3e0749cc5bd7f5810ac6fd7a3feee4df0435ee0a)]
 - test: Add unit tests for utils - refs #253277 [ana-oprea - [`a709895`](https://github.com/eea/volto-slate-footnote/commit/a709895d9953742ef6d39f8d9673c06b2efe6a64)]
 - test: Fix test config, coverage Refs #253277 [valentinab25 - [`dc4d6dc`](https://github.com/eea/volto-slate-footnote/commit/dc4d6dc9b39bfe2c892156f32c764153d1366486)]
-- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`4f0ecee`](https://github.com/eea/volto-slate-footnote/commit/4f0ecee224d5d6604dfbb562556e45437edbb8ec)]
 ### [6.1.0](https://github.com/eea/volto-slate-footnote/compare/6.0.2...6.1.0) - 27 March 2023
 
 #### :hammer_and_wrench: Others
 
-- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`23959ee`](https://github.com/eea/volto-slate-footnote/commit/23959ee43d45ec5eaa483590415a75fc58faae03)]
-- Add Sonarqube tag using advisory-board-frontend addons list [EEA Jenkins - [`7aa6f34`](https://github.com/eea/volto-slate-footnote/commit/7aa6f3439953cc3d8f28875eff9fbcc24084cbc7)]
-- Add Sonarqube tag using advisory-board-frontend addons list [EEA Jenkins - [`b117d15`](https://github.com/eea/volto-slate-footnote/commit/b117d15e51b3cf10717b9dd9dfef8304d46ad556)]
 - test(Jenkins): Run tests and cypress with latest canary @plone/volto [Alin Voinea - [`97ed8fb`](https://github.com/eea/volto-slate-footnote/commit/97ed8fbd92f76c2b3128b62cdc1a77611e79410a)]
-- Add Sonarqube tag using cca-frontend addons list [EEA Jenkins - [`cb22f5e`](https://github.com/eea/volto-slate-footnote/commit/cb22f5e8e9d3aed0a3b4374b6d4d80c8c2bb66e1)]
-- yarn 3 [Alin Voinea - [`f5bb904`](https://github.com/eea/volto-slate-footnote/commit/f5bb904eecf740ffd57dbccf9a597c99ea2dfc0c)]
-- Add Sonarqube tag using demo-kitkat-frontend addons list [EEA Jenkins - [`59cf6d3`](https://github.com/eea/volto-slate-footnote/commit/59cf6d334a460e373dda3e2e28754fcdd9fb0281)]
 ### [6.0.2](https://github.com/eea/volto-slate-footnote/compare/6.0.1...6.0.2) - 16 November 2022
 
 #### :hammer_and_wrench: Others
@@ -149,45 +145,34 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 #### :hammer_and_wrench: Others
 
-- Add Sonarqube tag using marine-frontend addons list [EEA Jenkins - [`dc3c7de`](https://github.com/eea/volto-slate-footnote/commit/dc3c7deaa8c692689ea0cec66cf019f05f9c4e22)]
-- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`133969a`](https://github.com/eea/volto-slate-footnote/commit/133969a37a6153a19af121d2f6031a70bc67cc9d)]
 ### [5.0.1](https://github.com/eea/volto-slate-footnote/compare/5.0.0...5.0.1) - 30 June 2022
 
 #### :hammer_and_wrench: Others
 
-- Add Sonarqube tag using circularity-frontend addons list [EEA Jenkins - [`4d5af13`](https://github.com/eea/volto-slate-footnote/commit/4d5af1345aad9071c031f7f00efd6bc5da04541f)]
 ## [5.0.0](https://github.com/eea/volto-slate-footnote/compare/4.0.5...5.0.0) - 19 May 2022
 
 ### [4.0.5](https://github.com/eea/volto-slate-footnote/compare/4.0.4...4.0.5) - 17 May 2022
 
 #### :hammer_and_wrench: Others
 
-- Add Sonarqube tag using clms-frontend addons list [EEA Jenkins - [`85a16ee`](https://github.com/eea/volto-slate-footnote/commit/85a16ee73d21d696282dc24933169d3c31383027)]
-- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`418349c`](https://github.com/eea/volto-slate-footnote/commit/418349ce22d98bf5dee58130d6f1cb9f45bbaa46)]
 ### [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) - 18 December 2021
 
 #### :hammer_and_wrench: Others
 
-- Add Sonarqube tag using freshwater-frontend addons list [EEA Jenkins - [`ad06940`](https://github.com/eea/volto-slate-footnote/commit/ad0694074a06eb56ec1891256b262e9854c0303d)]
 - Refs #142010 - Optimize Volto-addons gitflow pipelines [valentinab25 - [`1081079`](https://github.com/eea/volto-slate-footnote/commit/1081079444f5ac806e9d56765c4ccf0b9e415a73)]
-- Add Sonarqube tag using industry-frontend addons list [EEA Jenkins - [`307687b`](https://github.com/eea/volto-slate-footnote/commit/307687b93d966e0df5c4a3f813dbb19442d2e169)]
-- Add Sonarqube tag using clms-frontend addons list [EEA Jenkins - [`0460e2a`](https://github.com/eea/volto-slate-footnote/commit/0460e2a73a4c8ede00b0c1fc3f05624eaa345a33)]
-- Add Sonarqube tag using forests-frontend addons list [EEA Jenkins - [`8aecee9`](https://github.com/eea/volto-slate-footnote/commit/8aecee99f11387e4ce31825209798772d7fee060)]
 ### [4.0.2](https://github.com/eea/volto-slate-footnote/compare/4.0.1...4.0.2) - 30 September 2021
 
 #### :hammer_and_wrench: Others
 
-- Add Sonarqube tag using sustainability-frontend addons list [EEA Jenkins - [`cf33efe`](https://github.com/eea/volto-slate-footnote/commit/cf33efec91b4b8d13562b8c8f660e7a78191d9e0)]
 - Remove :asDefault dependency from volto-slate [Alin Voinea - [`13dad5e`](https://github.com/eea/volto-slate-footnote/commit/13dad5ed23043fa7a24682e1ac6addc86632bfe0)]
 ### [4.0.1](https://github.com/eea/volto-slate-footnote/compare/4.0.0...4.0.1) - 29 September 2021
 
 ## [4.0.0](https://github.com/eea/volto-slate-footnote/compare/3.2.0...4.0.0) - 24 September 2021
 
 #### :hammer_and_wrench: Others
 
-- Add Sonarqube tag using climate-energy-frontend addons list [EEA Jenkins - [`80a159b`](https://github.com/eea/volto-slate-footnote/commit/80a159bb67698cddedadc494e7ae2da32a96faea)]
 ### [3.2.0](https://github.com/eea/volto-slate-footnote/compare/3.1.1...3.2.0) - 13 September 2021
 
 #### :hammer_and_wrench: Others
@@ -200,7 +185,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - Remove console.log [Alin Voinea - [`b5d83e7`](https://github.com/eea/volto-slate-footnote/commit/b5d83e7c13240151f602d122ecf09ba9b8e335f3)]
 - Fix slate json field default value in DX layout [Alin Voinea - [`f2805bb`](https://github.com/eea/volto-slate-footnote/commit/f2805bbc15c51ebd914ee5f4eb9dd34ef32e095b)]
 - Fix cypress api_url [Alin Voinea - [`6a4966a`](https://github.com/eea/volto-slate-footnote/commit/6a4966a2f92e932e1d0df35351989cda535f15c8)]
-- Add Sonarqube tag using ims-frontend addons list [EEA Jenkins - [`aed3984`](https://github.com/eea/volto-slate-footnote/commit/aed39840ecd467689eaf0adb352bd00ce95bdbbe)]
 ### [3.1.0](https://github.com/eea/volto-slate-footnote/compare/3.0.0...3.1.0) - 9 September 2021
 
 #### :hammer_and_wrench: Others
@@ -221,7 +205,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - Bump version to 2.4.0 [Alin Voinea - [`bef0d34`](https://github.com/eea/volto-slate-footnote/commit/bef0d34c2b9c20915578ffaefb4fd30cbf42f0a1)]
 - Fix Slate point from DOM crash [Alin Voinea - [`c852f79`](https://github.com/eea/volto-slate-footnote/commit/c852f7987ffe8db433235b70792002d40ade690f)]
 - Fix crash on copy&paste beforeInsert condition [Alin Voinea - [`85172cf`](https://github.com/eea/volto-slate-footnote/commit/85172cff3e2ea95a86d4b4fb452f3c0287b80e8f)]
-- Add Sonarqube tag using frontend addons list [EEA Jenkins - [`b471c41`](https://github.com/eea/volto-slate-footnote/commit/b471c418d198b1bde95acfe0b256f642bacc6865)]
 ### [2.3.1](https://github.com/eea/volto-slate-footnote/compare/2.3.0...2.3.1) - 25 June 2021
 
 ### [2.3.0](https://github.com/eea/volto-slate-footnote/compare/2.2.2...2.3.0) - 12 June 2021

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-slate-footnote",
-  "version": "6.2.3",
+  "version": "6.3.0",
   "description": "volto-slate-footnote: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",

diff --git a/src/Blocks/Footnote/FootnotesBlockView.jsx b/src/Blocks/Footnote/FootnotesBlockView.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import {
-  openAccordionIfContainsFootnoteReference,
+  openAccordionOrTabIfContainsFootnoteReference,
   getAllBlocksAndSlateFields,
   makeFootnoteListOfUniqueItems,
   makeFootnote,
@@ -107,7 +107,7 @@ const FootnotesBlockView = (props) => {
                         href={`#ref-${parentUid || uid}`}
                         aria-label="Back to content"
                         onClick={() =>
-                          openAccordionIfContainsFootnoteReference(
+                          openAccordionOrTabIfContainsFootnoteReference(
                             `#ref-${parentUid || uid}`,
                           )
                         }
@@ -122,7 +122,7 @@ const FootnotesBlockView = (props) => {
                           href={`#ref-${ref}`}
                           aria-label="Back to content"
                           onClick={() =>
-                            openAccordionIfContainsFootnoteReference(
+                            openAccordionOrTabIfContainsFootnoteReference(
                               `#ref-${ref}`,
                             )
                           }
@@ -139,7 +139,7 @@ const FootnotesBlockView = (props) => {
                       href={`#ref-${parentUid || uid}`}
                       aria-label="Back to content"
                       onClick={() =>
-                        openAccordionIfContainsFootnoteReference(
+                        openAccordionOrTabIfContainsFootnoteReference(
                           `#ref-${parentUid || uid}`,
                         )
                       }

diff --git a/src/editor/render.jsx b/src/editor/render.jsx
@@ -4,7 +4,7 @@ import { useEditorContext } from '@plone/volto-slate/hooks';
 import { getAllBlocksAndSlateFields } from '@eeacms/volto-slate-footnote/editor/utils';
 import {
   makeFootnoteListOfUniqueItems,
-  openAccordionIfContainsFootnoteReference,
+  openAccordionOrTabIfContainsFootnoteReference,
 } from './utils';
 import { isEmpty } from 'lodash';
 import { useSelector } from 'react-redux';
@@ -112,7 +112,7 @@ export const FootnoteElement = (props) => {
                   as={UniversalLink}
                   href={`#footnote-${citationRefId}`}
                   onClick={() =>
-                    openAccordionIfContainsFootnoteReference(
+                    openAccordionOrTabIfContainsFootnoteReference(
                       `#footnote-${citationRefId}`,
                     )
                   }
@@ -134,7 +134,7 @@ export const FootnoteElement = (props) => {
                       as={UniversalLink}
                       href={`#footnote-${item.zoteroId || item.uid}`}
                       onClick={() =>
-                        openAccordionIfContainsFootnoteReference(
+                        openAccordionOrTabIfContainsFootnoteReference(
                           `#footnote-${item.zoteroId || item.uid}`,
                         )
                       }
@@ -176,7 +176,7 @@ export const FootnoteElement = (props) => {
                 as={UniversalLink}
                 href={`#footnote-${citationRefId}`}
                 onClick={() =>
-                  openAccordionIfContainsFootnoteReference(
+                  openAccordionOrTabIfContainsFootnoteReference(
                     `#footnote-${citationRefId}`,
                   )
                 }
@@ -198,7 +198,7 @@ export const FootnoteElement = (props) => {
                     as={UniversalLink}
                     href={`#footnote-${item.zoteroId || item.uid}`}
                     onClick={() =>
-                      openAccordionIfContainsFootnoteReference(
+                      openAccordionOrTabIfContainsFootnoteReference(
                         `#footnote-${item.zoteroId || item.uid}`,
                       )
                     }

diff --git a/src/editor/utils.js b/src/editor/utils.js
@@ -46,15 +46,34 @@ const retriveValuesOfSlateFromNestedPath = (path, value) => {
  * Will open accordion if contains footnote reference
  * @param {string} footnoteId
  */
-export const openAccordionIfContainsFootnoteReference = (footnoteId) => {
+export const openAccordionOrTabIfContainsFootnoteReference = (footnoteId) => {
   if (typeof window !== 'undefined') {
     const footnote = document.querySelector(footnoteId);
+
     if (footnote !== null && footnote.closest('.accordion') !== null) {
       const comp = footnote.closest('.accordion').querySelector('.title');
       if (!comp.className.includes('active')) {
         comp.click();
       }
     }
+
+    if (footnote !== null && footnote.closest('.tab-name') !== null) {
+      const idOfTabBlock = footnote.closest('.tabs-block').id;
+
+      const idOfTabPanel = footnote.closest('.tab-name').id;
+      const allTabs = document
+        .getElementById(idOfTabBlock)
+        .getElementsByClassName('menu-item-text');
+
+      (Array.from(allTabs) || []).forEach((tab) => {
+        if (
+          tab.textContent === idOfTabPanel &&
+          !tab.parentElement.classList.contains('active')
+        ) {
+          tab.parentElement.click();
+        }
+      });
+    }
   }
 
   return true;

diff --git a/src/editor/utils.test.js b/src/editor/utils.test.js
@@ -1,6 +1,6 @@
 import {
   makeFootnote,
-  openAccordionIfContainsFootnoteReference,
+  openAccordionOrTabIfContainsFootnoteReference,
   getAllBlocksAndSlateFields,
 } from './utils';
 import { getAllBlocks } from '@plone/volto-slate/utils';
@@ -22,7 +22,7 @@ describe('makeFootnote', () => {
   });
 });
 
-describe('openAccordionIfContainsFootnoteReference', () => {
+describe('openAccordionOrTabIfContainsFootnoteReference', () => {
   it('should open accordion if it contains footnote reference', () => {
     document.body.innerHTML = `
       <div class="accordion">
@@ -34,7 +34,7 @@ describe('openAccordionIfContainsFootnoteReference', () => {
     const title = document.querySelector('.title');
     title.click = jest.fn();
 
-    openAccordionIfContainsFootnoteReference('#footnote');
+    openAccordionOrTabIfContainsFootnoteReference('#footnote');
 
     expect(title.click).toHaveBeenCalled();
   });
@@ -49,7 +49,7 @@ describe('openAccordionIfContainsFootnoteReference', () => {
     const title = document.querySelector('.title');
     title.click = jest.fn();
 
-    openAccordionIfContainsFootnoteReference('#footnote');
+    openAccordionOrTabIfContainsFootnoteReference('#footnote');
 
     expect(title.click).not.toHaveBeenCalled();
   });