@eeacms/volto-marine-policy 2.0.29 → 2.0.31

package/CHANGELOG.md

@@ -4,6 +4,23 @@ 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).
 
+### [2.0.31](https://github.com/eea/volto-marine-policy/compare/2.0.30...2.0.31) - 10 October 2025
+
+#### :hammer_and_wrench: Others
+
+- refs #293080 added volto/actions/vocabularies/vocabularies.js customization to fix error [laszlocseh - [`485e27a`](https://github.com/eea/volto-marine-policy/commit/485e27a7a33661830531d105febbdad4cb58bbe4)]
+### [2.0.30](https://github.com/eea/volto-marine-policy/compare/2.0.29...2.0.30) - 22 September 2025
+
+#### :house: Internal changes
+
+- style: Automated code fix [eea-jenkins - [`5d52587`](https://github.com/eea/volto-marine-policy/commit/5d525877d8d3f93b75ac0f2f71853e754a0f1b3b)]
+
+#### :hammer_and_wrench: Others
+
+- fix eslint [laszlocseh - [`da4441c`](https://github.com/eea/volto-marine-policy/commit/da4441ca4a77b97d0aebc967120a61e2b87e14ca)]
+- fix eslint [laszlocseh - [`390c0ad`](https://github.com/eea/volto-marine-policy/commit/390c0addf4a174f1fe452302a88df978cb24b684)]
+- fix eslint [laszlocseh - [`c704506`](https://github.com/eea/volto-marine-policy/commit/c7045065771916ba77437143e1916875537687e3)]
+- fix msfd data explorer scripts loading [laszlocseh - [`cb5d9ea`](https://github.com/eea/volto-marine-policy/commit/cb5d9eab1efb988f523b579ca4fa193fdaaf64bd)]
 ### [2.0.29](https://github.com/eea/volto-marine-policy/compare/2.0.28...2.0.29) - 22 September 2025
 
 #### :hammer_and_wrench: Others

package/package.json

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

package/src/components/Blocks/MsfdDataExplorerBlock/View.jsx

@@ -39,41 +39,76 @@ const MsfdDataExplorerBlockView = (props) => {
     window.jQuery = $;
     global.jQuery = $;
 
-    const scripts = [
-      'https://cdnjs.cloudflare.com/ajax/libs/select2/3.5.4/select2.min.js',
-      '/marine/++api++/++resource++msfd/js/jquery-ui.js',
-      '/marine/++api++/++resource++msfd/js/tabs.js',
-      '/marine/++api++/++resource++msfd/js/msfd_search.js',
-      '/marine/++api++/++resource++msfd/bs3/js/bootstrap.min.js',
-    ];
-
     if (!loading) {
-      $.getScript(scripts[0], () => {
-        $.getScript(scripts[1], () => {
-          $.getScript(scripts[2], () => {
-            $.getScript(scripts[3], () => {
-              $.getScript(scripts[4]);
-            });
+      const scripts = [
+        'https://cdnjs.cloudflare.com/ajax/libs/select2/3.5.4/select2.min.js',
+        '/marine/++api++/++resource++msfd/js/jquery-ui.js',
+        '/marine/++api++/++resource++msfd/js/tabs.js',
+        '/marine/++api++/++resource++msfd/js/msfd_search.js',
+        '/marine/++api++/++resource++msfd/bs3/js/bootstrap.min.js',
+      ];
+      const loadScripts = async () => {
+        for (const src of scripts) {
+          await new Promise((resolve, reject) => {
+            const script = document.createElement('script');
+            script.src = src;
+            script.type = 'text/javascript';
+            script.async = false; // load in order
+            script.onload = resolve;
+            script.onerror = reject;
+            document.body.appendChild(script);
           });
-        });
-      });
-
-      // scripts.forEach((element) => {
-      //   // $.getScript(element);
-      //   const script = document.createElement('script');
-      //   script.src = element;
-      //   script.setAttribute('type', 'text/javascript');
-      //   script.async = false;
-      //   // script.defer = 'defer';
-
-      //   document.body.appendChild(script);
-      // });
-      // setTimeout(() => {
-      //   $.getScript('/++api++/++resource++msfd/js/msfd_search.js');
-      // }, 200);
+        }
+      };
+      loadScripts();
+      // .then(() => {
+      //   console.log('All scripts loaded');
+      //   // $('.msfd-search-wrapper select').select2();
+      // })
+      // .catch((err) => console.error('Script load error', err));
     }
   }, [loading]);
 
+  // useEffect(() => {
+  //   window.$ = $;
+  //   window.jQuery = $;
+  //   global.jQuery = $;
+
+  //   const scripts = [
+  //     'https://cdnjs.cloudflare.com/ajax/libs/select2/3.5.4/select2.min.js',
+  //     '/++api++/++resource++msfd/js/jquery-ui.js',
+  //     '/++api++/++resource++msfd/js/tabs.js',
+  //     '/++api++/++resource++msfd/js/msfd_search.js',
+  //     '/++api++/++resource++msfd/bs3/js/bootstrap.min.js',
+  //   ];
+
+  //   if (!loading) {
+  //     $.getScript(scripts[0], () => {
+  //       $.getScript(scripts[1], () => {
+  //         $.getScript(scripts[2], () => {
+  //           $.getScript(scripts[3], () => {
+  //             $.getScript(scripts[4]);
+  //           });
+  //         });
+  //       });
+  //     });
+
+  //     // scripts.forEach((element) => {
+  //     //   // $.getScript(element);
+  //     //   const script = document.createElement('script');
+  //     //   script.src = element;
+  //     //   script.setAttribute('type', 'text/javascript');
+  //     //   script.async = false;
+  //     //   // script.defer = 'defer';
+
+  //     //   document.body.appendChild(script);
+  //     // });
+  //     // setTimeout(() => {
+  //     //   $.getScript('/++api++/++resource++msfd/js/msfd_search.js');
+  //     // }, 200);
+  //   }
+  // }, [loading]);
+
   return (
     <>
       {article_select ? (

package/src/customizations/volto/actions/vocabularies/vocabularies.js

@@ -0,0 +1,89 @@
+/**
+ * Vocabularies actions.
+ * @module actions/vocabularies/vocabularies
+ */
+
+import {
+  GET_VOCABULARY,
+  GET_VOCABULARY_TOKEN_TITLE,
+} from '@plone/volto/constants/ActionTypes';
+import { getVocabName } from '@plone/volto/helpers/Vocabularies/Vocabularies';
+import { flattenToAppURL } from '@plone/volto/helpers/Url/Url';
+import qs from 'query-string';
+
+/**
+ * Get vocabulary given a URL (coming from a Schema) or from a vocabulary name.
+ * @function getVocabulary
+ * @param {string} vocabNameOrURL Full API URL of vocabulary or vocabulary name
+ * @param {string} query Only include results containing this string.
+ * @param {number} start Start of result batch.
+ * @param {number} b_size The size of the batch.
+ * @param {string} subrequest Name of the subrequest.
+ * @returns {Object} Get vocabulary action.
+ */
+export function getVocabulary({
+  vocabNameOrURL,
+  query = null,
+  start = 0,
+  size,
+  subrequest,
+}) {
+  const vocabPath = String(vocabNameOrURL).includes('/')
+    ? flattenToAppURL(vocabNameOrURL)
+    : `/@vocabularies/${vocabNameOrURL}`;
+
+  let queryString = `b_start=${start}${size ? '&b_size=' + size : ''}`;
+
+  if (query) {
+    queryString = `${queryString}&title=${query}`;
+  }
+  return {
+    type: GET_VOCABULARY,
+    vocabulary: vocabNameOrURL,
+    start,
+    request: {
+      op: 'get',
+      path: `${vocabPath}?${queryString}`,
+    },
+    subrequest,
+  };
+}
+
+/**
+ * Get the title value given a token from vocabulary given a vocabulary URL
+ * (coming from a Schema) or from a vocabulary name.
+ * @function getVocabularyTokenTitle
+ * @param {string} vocabNameOrURL Full API URL of vocabulary or vocabulary name
+ * @param {string} token Only include results containing this string.
+ * @returns {Object} Get vocabulary action.
+ */
+export function getVocabularyTokenTitle({
+  vocabNameOrURL,
+  token = null,
+  tokens = null,
+  subrequest,
+}) {
+  // In case we have a URL, we have to get the vocabulary name
+  const vocabulary = getVocabName(vocabNameOrURL);
+  const queryString = {
+    ...(token && { token }),
+    ...(tokens && { tokens }),
+  };
+
+  return {
+    type: GET_VOCABULARY_TOKEN_TITLE,
+    vocabulary: vocabNameOrURL,
+    token,
+    tokens,
+    subrequest,
+    request: {
+      op: 'get',
+      path: `/@vocabularies/${vocabulary}?b_size=-1&${qs.stringify(
+        queryString,
+        {
+          encode: false,
+        },
+      )}`,
+    },
+  };
+}