@eeacms/volto-bise-policy 1.2.17 → 1.2.19

package/CHANGELOG.md

@@ -4,7 +4,32 @@ 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.2.17](https://github.com/eea/volto-bise-policy/compare/1.2.16...1.2.17) - 23 May 2025
+### [1.2.19](https://github.com/eea/volto-bise-policy/compare/1.2.18...1.2.19) - 30 June 2025
+
+#### :bug: Bug Fixes
+
+- fix: extend column schema to populate choices [nileshgulia1 - [`6897739`](https://github.com/eea/volto-bise-policy/commit/6897739b206ba4d7618dc222b5c2d2b88a99d6af)]
+
+#### :house: Internal changes
+
+- style: Automated code fix [eea-jenkins - [`9b23b7c`](https://github.com/eea/volto-bise-policy/commit/9b23b7c7f1646feb814b03d4ee88ca79d093b536)]
+- style: Automated code fix [eea-jenkins - [`0767bb6`](https://github.com/eea/volto-bise-policy/commit/0767bb68e90dae2570edead9201b36d5a99319e6)]
+
+#### :hammer_and_wrench: Others
+
+- add custom css basic block [Claudia Ifrim - [`3a43d19`](https://github.com/eea/volto-bise-policy/commit/3a43d1909e185be80e17a82434917c1c42ee6c77)]
+- custom js block [Claudia Ifrim - [`8e40d21`](https://github.com/eea/volto-bise-policy/commit/8e40d219592b816d274c3b3143c39f0737de82da)]
+- rename simple data table customization [Claudia Ifrim - [`9e1bc9e`](https://github.com/eea/volto-bise-policy/commit/9e1bc9e0af3d3c2be9eaf129b2bb03d72a0805eb)]
+### [1.2.18](https://github.com/eea/volto-bise-policy/compare/1.2.17...1.2.18) - 23 June 2025
+
+#### :house: Internal changes
+
+- style: Automated code fix [eea-jenkins - [`58c352b`](https://github.com/eea/volto-bise-policy/commit/58c352b8c54e2c62795f2a468b02ee4b71aa6030)]
+
+#### :hammer_and_wrench: Others
+
+- hide expert view header link on national and emerald sites [Claudia Ifrim - [`a65b6b4`](https://github.com/eea/volto-bise-policy/commit/a65b6b407a51d93bfe150b62e2bff7dd63f4e423)]
+### [1.2.17](https://github.com/eea/volto-bise-policy/compare/1.2.16...1.2.17) - 26 May 2025
 
 #### :bug: Bug Fixes
 
@@ -89,7 +114,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - chore: customize root theme to use volto-spotlight - refs #259794 [ana-oprea - [`347f96e`](https://github.com/eea/volto-bise-policy/commit/347f96e335139f9656abd34c308c531b05de85e7)]
 - chore: change the theme and alias to volto-spotlight and add volto-spotlight to package.json - refs #259794 [ana-oprea - [`52732a1`](https://github.com/eea/volto-bise-policy/commit/52732a17b3247a04ffae0a3f5118e173afa98157)]
 - chore: change theme to eea-volto-theme, change config.alias - refs #259794 [ana-oprea - [`c2d08ea`](https://github.com/eea/volto-bise-policy/commit/c2d08ea08a7f0e5f6f7d32149e60ea3f3e901923)]
-- chore: [JENKINS] Refactor automated testing [valentinab25 - [`a3c9488`](https://github.com/eea/volto-bise-policy/commit/a3c9488c5d09ba97fe5976675524d436080a2460)]
 - chore: husky, lint-staged use fixed versions [valentinab25 - [`fddc30f`](https://github.com/eea/volto-bise-policy/commit/fddc30f11a1d8ec290edaca2d924282f5e113bc6)]
 - chore:volto 16 in tests, update docs, fix stylelint overrides [valentinab25 - [`005ce74`](https://github.com/eea/volto-bise-policy/commit/005ce742dbd014fde27e417059251233365766dd)]
 
@@ -102,17 +126,9 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - test: Update jest,Jenkinsfile,lint to volto-addons-template PR30 [valentinab25 - [`c1277ba`](https://github.com/eea/volto-bise-policy/commit/c1277bacf840ee9feccbfd6a2c85f0b25a9a9125)]
 - test: Update jest,Jenkinsfile,lint to volto-addons-template PR30 [valentinab25 - [`c944153`](https://github.com/eea/volto-bise-policy/commit/c944153710fd53c5d48863cf363464273e25f52e)]
 - test: Update jest,Jenkinsfile,lint to volto-addons-template PR30 [valentinab25 - [`d648d52`](https://github.com/eea/volto-bise-policy/commit/d648d525a2fc5076577fe0f75ff9782bf0d1d4e9)]
-- test: [JENKINS] fix jest config, fail with logs on coverage [valentinab25 - [`2a7affe`](https://github.com/eea/volto-bise-policy/commit/2a7affe33d737704bdba117c4a5c8c6748ef7a47)]
-- test: [JENKINS] fix jest config, fail with logs on coverage [valentinab25 - [`5929642`](https://github.com/eea/volto-bise-policy/commit/59296420105d0e8c1f1547aa0cd17a019e478c2b)]
-- test: [JENKINS] fix jest config, fail with logs on coverage [valentinab25 - [`b1142f1`](https://github.com/eea/volto-bise-policy/commit/b1142f1da3667a9f56720f65bebce897a5dd8005)]
 - test: cypress should not wait for navigation, actions, types - refs #259794 [ana-oprea - [`188637c`](https://github.com/eea/volto-bise-policy/commit/188637c78a0cae71b5ee48022507d559dfaceb3e)]
-- test: [JENKINS] Use java17 for sonarqube scanner [valentinab25 - [`fa4e473`](https://github.com/eea/volto-bise-policy/commit/fa4e473018386ec3f09d7300d655c8cccdc19a0e)]
-- test: [JENKINS] Run cypress in started frontend container [valentinab25 - [`1d9135b`](https://github.com/eea/volto-bise-policy/commit/1d9135bb878b3c7a1b828085b99b9d27d78ce60e)]
 - remove cypress tests as it doesn t work on bise [Dobricean Ioan Dorian - [`ba7e2de`](https://github.com/eea/volto-bise-policy/commit/ba7e2defea2dcfd01537c3abb41fa9515ff0a3e3)]
 - add mega menu layout settings as #259794 said [dobri1408 - [`b9a3683`](https://github.com/eea/volto-bise-policy/commit/b9a3683e7d85f8c88ad8feac975c47c434f62c4a)]
-- test: [JENKINS] Add cpu limit on cypress docker [valentinab25 - [`9181908`](https://github.com/eea/volto-bise-policy/commit/9181908c7f4b51bdf83a34f8c7f25827de9b1cc6)]
-- test: [JENKINS] Increase shm-size to cypress docker [valentinab25 - [`099d796`](https://github.com/eea/volto-bise-policy/commit/099d79669471e6924bf1e0bc51a79d54379c3a1a)]
-- test: [JENKINS] Improve cypress time [valentinab25 - [`6d5d8e2`](https://github.com/eea/volto-bise-policy/commit/6d5d8e29b04ddb92628245570055067ca3dcbb6c)]
 - test: fix comment [valentinab25 - [`4f27d5a`](https://github.com/eea/volto-bise-policy/commit/4f27d5af2e8895c7af4f1157521ca42682b96e23)]
 - test: EN locales, pre-commit fix, feature PRs checks Refs #257193 [valentinab25 - [`4c2fcb0`](https://github.com/eea/volto-bise-policy/commit/4c2fcb01065e1ef962317ba7be788fd1df079618)]
 - test: Update Makefile and docker-compose to align it with Jenkinsfile [valentinab25 - [`89afaa1`](https://github.com/eea/volto-bise-policy/commit/89afaa15892930452027ef8c8593fc6d193cda70)]

package/package.json

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

package/src/components/manage/Blocks/CustomCSS/CustomCSSEdit.jsx

@@ -0,0 +1,16 @@
+import { TextareaWidget } from '@plone/volto/components';
+
+const CustomCSSBlockEdit = ({ data, onChangeBlock, block }) => {
+  return (
+    <TextareaWidget
+      id="cssCode"
+      title="Inline CSS"
+      value={data.cssCode}
+      onChange={(id, value) =>
+        onChangeBlock(block, { ...data, cssCode: value })
+      }
+    />
+  );
+};
+
+export default CustomCSSBlockEdit;

package/src/components/manage/Blocks/CustomCSS/CustomCSSView.jsx

@@ -0,0 +1,17 @@
+import { useEffect } from 'react';
+
+const CustomCSSBlockView = ({ data }) => {
+  useEffect(() => {
+    const style = document.createElement('style');
+    style.innerHTML = data?.cssCode || '';
+    document.head.appendChild(style);
+
+    return () => {
+      document.head.removeChild(style);
+    };
+  }, [data]);
+
+  return null;
+};
+
+export default CustomCSSBlockView;

package/src/components/manage/Blocks/CustomCSS/index.js

@@ -0,0 +1,26 @@
+import codeSVG from '@plone/volto/icons/code.svg';
+import CustomCSSView from './CustomCSSView';
+import CustomCSSEdit from './CustomCSSEdit';
+
+const config = (config) => {
+  config.blocks.blocksConfig.biseCustomCSS = {
+    id: 'biseCustomCSS',
+    title: 'Custom CSS',
+    icon: codeSVG,
+    group: 'custom_addons',
+    view: CustomCSSView,
+    edit: CustomCSSEdit,
+    restricted: false,
+    mostUsed: false,
+    blockHasOwnFocusManagement: false,
+    sidebarTab: 1,
+    security: {
+      addPermission: [],
+      view: [],
+    },
+  };
+
+  return config;
+};
+
+export default config;

package/src/components/manage/Blocks/CustomJS/CustomJSEdit.jsx

@@ -0,0 +1,14 @@
+import { TextareaWidget } from '@plone/volto/components';
+
+const CustomJSBlockEdit = ({ data, onChangeBlock, block }) => {
+  return (
+    <TextareaWidget
+      id="jsCode"
+      title="Inline JavaScript"
+      value={data.jsCode}
+      onChange={(id, value) => onChangeBlock(block, { ...data, jsCode: value })}
+    />
+  );
+};
+
+export default CustomJSBlockEdit;

package/src/components/manage/Blocks/CustomJS/CustomJSView.jsx

@@ -0,0 +1,18 @@
+import { useEffect } from 'react';
+
+const CustomJSBlockView = ({ data }) => {
+  useEffect(() => {
+    const script = document.createElement('script');
+    script.type = 'text/javascript';
+    script.innerHTML = data?.jsCode || '';
+    document.body.appendChild(script);
+
+    return () => {
+      document.body.removeChild(script);
+    };
+  }, [data]);
+
+  return null;
+};
+
+export default CustomJSBlockView;

package/src/components/manage/Blocks/CustomJS/index.js

@@ -0,0 +1,26 @@
+import codeSVG from '@plone/volto/icons/code.svg';
+import CustomJSView from './CustomJSView';
+import CustomJSEdit from './CustomJSEdit';
+
+const config = (config) => {
+  config.blocks.blocksConfig.biseCustomJS = {
+    id: 'biseCustomJS',
+    title: 'Custom JS',
+    icon: codeSVG,
+    group: 'custom_addons',
+    view: CustomJSView,
+    edit: CustomJSEdit,
+    restricted: false,
+    mostUsed: false,
+    blockHasOwnFocusManagement: false,
+    sidebarTab: 1,
+    security: {
+      addPermission: [],
+      view: [],
+    },
+  };
+
+  return config;
+};
+
+export default config;

package/src/components/manage/Blocks/index.js

@@ -1,4 +1,6 @@
 import installBodyClass from './BodyClass';
+import installCustomJS from './CustomJS';
+import installCustomCSS from './CustomCSS';
 import installRedirect from './Redirect';
 import installFactsheetsListing from './FactsheetsListing';
 import installKeyFacts from './KeyFacts';
@@ -8,6 +10,8 @@ import installNavigation from './Navigation';
 const config = (config) => {
   return [
     installBodyClass,
+    installCustomJS,
+    installCustomCSS,
     installRedirect,
     installFactsheetsListing,
     installKeyFacts,

package/src/customizations/@eeacms/volto-datablocks/components/manage/Blocks/SimpleDataTable/Edit.jsx

@@ -69,13 +69,14 @@ class Edit extends Component {
 
     if (!provider_data) return schema;
 
-    const choices = Array.from(Object.keys(provider_data).sort()).map((n) => [
-      n,
-      n,
-    ]);
-
-    schema.properties.columns.schema.properties.column.choices = choices;
-    schema.properties.columns.schema.properties.column_link.choices = choices;
+    const choices = Array.from(
+      Object.keys(provider_data).sort((a, b) => a - b),
+    ).map((n) => [n, n]);
+    schema.properties.columns.schemaExtender = (schema) => {
+      schema.properties.column.choices = choices;
+      schema.properties.column_link.choices = choices;
+      return schema;
+    };
 
     return schema;
   };
@@ -109,7 +110,7 @@ const EditWrapper = compose(
   }),
 )(injectIntl(Edit));
 
-const $Edit = (props) => {
+const SimpleDataTableEdit = (props) => {
   return (
     <VisibilitySensor offset={{ top: -150, bottom: -150 }}>
       <EditWrapper {...props} />
@@ -117,4 +118,4 @@ const $Edit = (props) => {
   );
 };
 
-export default $Edit;
+export default SimpleDataTableEdit;

package/src/customizations/@eeacms/volto-datablocks/components/manage/Blocks/SimpleDataTable/index.js

@@ -11,12 +11,12 @@ import { ColoredTableView, coloredTableSchema } from './templates/colored';
 const applyConfig = (config) => {
   config.blocks.blocksConfig.simpleDataConnectedTable = {
     id: 'simpleDataConnectedTable',
-    title: 'Data Table',
+    title: 'Simple Data Table',
     icon: tableSVG,
     group: 'data_blocks',
     view: SimpleDataTableView,
     edit: SimpleDataTableEdit,
-    restricted: true,
+    restricted: false,
     mostUsed: false,
     sidebarTab: 1,
     security: {

package/src/customizations/@eeacms/volto-datablocks/components/manage/Blocks/SimpleDataTable/templates/smart/View.jsx

@@ -61,14 +61,16 @@ const View = (props) => {
       clearTimeout(timeoutRef.current);
       props.dispatch({ type: 'TABLE_START_SEARCH', query: data.value });
       timeoutRef.current = setTimeout(() => {
-        props.history.push({
-          search:
-            '?' +
-            qs.stringify({
-              ...props.query,
-              searchTerm: data.value,
-            }),
-        });
+        if (props.history) {
+          props.history.push({
+            search:
+              '?' +
+              qs.stringify({
+                ...props.query,
+                searchTerm: data.value,
+              }),
+          });
+        }
         if (data.value.length === 0) {
           props.dispatch({ type: 'TABLE_CLEAN_QUERY' });
           return;
@@ -233,9 +235,7 @@ const View = (props) => {
                 {placeholder}
               </Table.Cell>
             </Table.Row>
-          ) : (
-            ''
-          )}
+          ) : null}
         </Table.Body>
         {Math.ceil(items.length / row_size) > 1 ? (
           <Table.Footer>
@@ -258,9 +258,7 @@ const View = (props) => {
               </Table.HeaderCell>
             </Table.Row>
           </Table.Footer>
-        ) : (
-          ''
-        )}
+        ) : null}
       </Table>
     </div>
   );

package/src/customizations/volto/components/theme/Header/Header.jsx

@@ -74,7 +74,18 @@ const EEAHeader = ({ token, history, subsite, content, screen, ...props }) => {
 
   const isN2KSite = useMemo(() => {
     return !!matchPath(pathname, {
-      path: ['/natura2000/sites/site', '/natura2000/sites/site_cdda'],
+      path: [
+        '/natura2000/sites/site',
+        '/natura2000/sites/site_cdda',
+        '/natura2000/sites/emerald',
+      ],
+      exact: false,
+    });
+  }, [pathname]);
+
+  const hideExpertView = useMemo(() => {
+    return !!matchPath(pathname, {
+      path: ['/natura2000/sites/site_cdda', '/natura2000/sites/emerald'],
       exact: false,
     });
   }, [pathname]);
@@ -343,7 +354,10 @@ const EEAHeader = ({ token, history, subsite, content, screen, ...props }) => {
                     className: 'deep-dive',
                     target: params.site_code ? '_blank' : null,
                   },
-                ]
+                ].filter(
+                  (item) =>
+                    item.title !== 'GO TO EXPERT VIEW' || !hideExpertView,
+                )
               : isSubsite && !subsite.isRoot && !isN2KSpecies && !isN2KHabitat
               ? getSubsiteItems()
               : items.filter((item) => item.url !== '/natura2000')