@eeacms/volto-bise-policy 1.2.12 → 1.2.14

package/CHANGELOG.md

@@ -4,6 +4,15 @@ 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.14](https://github.com/eea/volto-bise-policy/compare/1.2.13...1.2.14) - 11 December 2024
+
+#### :hammer_and_wrench: Others
+
+- fix eslint [Miu Razvan - [`cb8d143`](https://github.com/eea/volto-bise-policy/commit/cb8d1438cdfd37840639879ea235fbd0eb69d59f)]
+- fix eslint [Miu Razvan - [`49f38f4`](https://github.com/eea/volto-bise-policy/commit/49f38f4509ae68e0658137511eacd521bac6c078)]
+- restrict factsheet block [Miu Razvan - [`daf4dcd`](https://github.com/eea/volto-bise-policy/commit/daf4dcd4684e121ccc86e26a2155ad127dbd7204)]
+### [1.2.13](https://github.com/eea/volto-bise-policy/compare/1.2.12...1.2.13) - 12 November 2024
+
 ### [1.2.12](https://github.com/eea/volto-bise-policy/compare/1.2.11...1.2.12) - 6 November 2024
 
 #### :bug: Bug Fixes
@@ -23,7 +32,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - update [Miu Razvan - [`48277be`](https://github.com/eea/volto-bise-policy/commit/48277bed1c4dc9ed7c24c3deddce76a0bb5b2d97)]
 - lint fix [Miu Razvan - [`a60d19d`](https://github.com/eea/volto-bise-policy/commit/a60d19d8c999e99a212bab03ef5b8118ab5c3690)]
 - merge develop into header-style [Miu Razvan - [`2ebf224`](https://github.com/eea/volto-bise-policy/commit/2ebf224cd30787516653244350e03dbf8624070a)]
-- update n2k style [Miu Razvan - [`1751cd2`](https://github.com/eea/volto-bise-policy/commit/1751cd227c849601d6d7b7fc071ffb977dff59c8)]
 - test: Update to volto 17 PR30 [valentinab25 - [`3ae5e75`](https://github.com/eea/volto-bise-policy/commit/3ae5e752557618a5acd617a7ce3f5bff5df65ec1)]
 - test: Update to volto 17 PR30 [valentinab25 - [`4cd82f2`](https://github.com/eea/volto-bise-policy/commit/4cd82f24a4bfec508a1a4de9035ffe4c75bda0ad)]
 ### [1.2.11](https://github.com/eea/volto-bise-policy/compare/1.2.10...1.2.11) - 28 May 2024
@@ -55,6 +63,7 @@ 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)]
 
@@ -67,9 +76,17 @@ 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.12",
+  "version": "1.2.14",
   "description": "@eeacms/volto-bise-policy: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",

package/razzle.extend.js

@@ -2,23 +2,12 @@ const path = require('path');
 const plugins = (defaultPlugins) => {
   return defaultPlugins;
 };
-const modify = (config, { target, dev }, webpack) => {
+const modify = (config) => {
   const themeConfigPath = `${__dirname}/theme/theme.config`;
   config.resolve.alias['../../theme.config$'] = themeConfigPath;
   config.resolve.alias['../../theme.config'] = themeConfigPath;
-  config.resolve.alias['../../theme'] = `${__dirname}/theme`;
-  const projectRootPath = path.resolve('.');
-  const themeLessPath = `${projectRootPath}/node_modules/@eeacms/volto-spotlight/theme`;
-
-  config.resolve.alias['volto-spotlight-theme'] = dev
-    ? `${projectRootPath}/src/addons/volto-spotlight/theme/themes/spotlight`
-    : `${themeLessPath}/themes/spotlight`;
 
-  const semanticLessPath = `${projectRootPath}/node_modules/semantic-ui-less`;
-  const hasDesignSystemInstalled =
-    config.resolve.alias['volto-spotlight-themes'];
-  config.resolve.alias['volto-spotlight-theme-folder'] =
-    hasDesignSystemInstalled ? themeLessPath : semanticLessPath;
+  config.resolve.alias['../../theme'] = `${__dirname}/theme`;
 
   return config;
 };

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

@@ -10,7 +10,7 @@ const config = (config) => {
     group: 'custom_addons',
     view: FactsheetsListingView,
     edit: FactsheetsListingEdit,
-    restricted: false,
+    restricted: true,
     mostUsed: false,
     blockHasOwnFocusManagement: false,
     sidebarTab: 1,

package/src/components/manage/Blocks/MaesViewer/MaesViewerEdit.jsx

@@ -1,64 +1,61 @@
-import React, { Component } from 'react';
+import { useMemo } from 'react';
 import { compose } from 'redux';
 import cx from 'classnames';
 import { SidebarPortal } from '@plone/volto/components'; // EditBlock
 import InlineForm from '@plone/volto/components/manage/Form/InlineForm';
 
-import MaesViewerSchema from './schema';
+import maesViewrSchema from './schema';
 import { connectToProviderData } from '@eeacms/volto-datablocks/hocs';
 import MaesViewerView from './MaesViewerView';
 import { defaultHoverTemplate } from './constants';
 
-class Edit extends Component {
-  constructor(props) {
-    super(props);
-    this.schema = MaesViewerSchema();
-  }
+function Edit(props) {
+  const { data, provider_data, block, selected, onChangeBlock } = props;
 
-  getSchema = () => {
-    if (!this.props.provider_data) return this.schema;
-    const provider_data = this.props.provider_data || {};
+  const schema = useMemo(() => {
+    if (!provider_data) return maesViewrSchema;
 
     const select_field = 'Ecosystem_level2';
     const choices = Array.from(
       new Set(provider_data?.[select_field] || []),
     ).map((n) => [n, n]);
 
-    const newSchema = this.schema;
+    const newSchema = { ...maesViewrSchema };
     newSchema.properties.ecosystem.choices = choices;
 
-    if (this.props.data && !this.props.data.hoverTemplate) {
-      this.props.onChangeBlock(this.props.block, {
-        ...this.props.data,
+    if (data && !data.hoverTemplate) {
+      onChangeBlock(block, {
+        ...data,
         hoverTemplate: defaultHoverTemplate,
       });
     }
 
     return newSchema;
-  };
-
-  render() {
-    const schema = this.getSchema();
-    return (
-      <div className={cx('block', { selected: this.props.selected })}>
-        <MaesViewerView data={this.props.data} />
-
-        <SidebarPortal selected={this.props.selected}>
-          <InlineForm
-            schema={schema}
-            title={schema.title}
-            onChangeField={(id, value) => {
-              this.props.onChangeBlock(this.props.block, {
-                ...this.props.data,
-                [id]: value,
-              });
-            }}
-            formData={this.props.data}
-          />
-        </SidebarPortal>
-      </div>
-    );
-  }
+  }, [block, data, onChangeBlock, provider_data]);
+
+  return (
+    <div className={cx('block', { selected })}>
+      <MaesViewerView data={data} />
+
+      <SidebarPortal selected={selected}>
+        <InlineForm
+          schema={schema}
+          title={schema.title}
+          onChangeField={(id, value) => {
+            onChangeBlock(block, {
+              ...data,
+              [id]: value,
+            });
+          }}
+          formData={data}
+        />
+      </SidebarPortal>
+    </div>
+  );
 }
 
-export default compose(connectToProviderData)(Edit);
+export default compose(
+  connectToProviderData((props) => ({
+    provider_url: props.data?.provider_url,
+  })),
+)(Edit);

package/src/components/manage/Blocks/MaesViewer/MaesViewerView.jsx

@@ -133,4 +133,8 @@ const View = ({ data, provider_data, id, ...rest }) => {
   );
 };
 
-export default compose(connectToProviderData)(View);
+export default compose(
+  connectToProviderData((props) => ({
+    provider_url: props.data?.provider_url,
+  })),
+)(View);

package/src/components/manage/Blocks/MaesViewer/schema.js

@@ -1,7 +1,6 @@
-import React from 'react';
 import { defaultHoverTemplate } from './constants';
 
-const MaesViewerSchema = () => ({
+const maesViewrSchema = {
   title: 'Edit MAES Viewer',
 
   fieldsets: [
@@ -27,7 +26,7 @@ const MaesViewerSchema = () => ({
       widget: 'slate_richtext',
     },
     provider_url: {
-      widget: 'pick_provider',
+      widget: 'internal_url',
       title: 'Data provider',
     },
     ecosystem: {
@@ -55,6 +54,6 @@ const MaesViewerSchema = () => ({
   },
 
   required: ['provider_url'],
-});
+};
 
-export default MaesViewerSchema;
+export default maesViewrSchema;

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

@@ -16,7 +16,7 @@ const applyConfig = (config) => {
     group: 'data_blocks',
     view: SimpleDataTableView,
     edit: SimpleDataTableEdit,
-    restricted: false,
+    restricted: true,
     mostUsed: false,
     sidebarTab: 1,
     security: {

package/theme/theme.config

@@ -127,7 +127,7 @@
 /*******************************
          Import Theme
 *******************************/
-@import (multiple) "~volto-spotlight-theme-folder/theme.less";
+@import (multiple) "~volto-spotlight-themes/../theme.less";
 
 @fontPath: "~volto-themes/default/assets/fonts";
 

package/theme/modules/accordion.variables

@@ -1,7 +0,0 @@
-/*******************************
-           Accordion
-*******************************/
-
-/* Icon */
-@iconColor: #fff;
-@iconColorActive: #fff;