@eeacms/volto-group-block 9.0.0 → 10.0.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (25) hide show
  1. package/.eslintrc.js +12 -7
  2. package/CHANGELOG.md +61 -1
  3. package/DEVELOP.md +23 -17
  4. package/README.md +45 -19
  5. package/cypress.config.js +9 -0
  6. package/docker-compose.yml +1 -1
  7. package/jest-addon.config.js +10 -4
  8. package/locales/de/LC_MESSAGES/volto.po +0 -20
  9. package/locales/en/LC_MESSAGES/volto.po +0 -20
  10. package/locales/it/LC_MESSAGES/volto.po +0 -20
  11. package/locales/ro/LC_MESSAGES/volto.po +0 -20
  12. package/locales/volto.pot +0 -20
  13. package/package.json +1 -1
  14. package/src/components/manage/Blocks/Group/CounterComponent.jsx +5 -5
  15. package/src/components/manage/Blocks/Group/CounterComponent.test.jsx +1 -1
  16. package/src/components/manage/Blocks/Group/DefaultBody.jsx +5 -39
  17. package/src/components/manage/Blocks/Group/DefaultBody.test.jsx +34 -8
  18. package/src/components/manage/Blocks/Group/Edit.jsx +10 -9
  19. package/src/components/manage/Blocks/Group/Edit.test.jsx +44 -11
  20. package/src/components/manage/Blocks/Group/View.jsx +1 -1
  21. package/src/components/manage/Blocks/Group/View.test.jsx +18 -11
  22. package/src/components/manage/Blocks/Group/editor.less +5 -30
  23. package/src/index.js +1 -1
  24. package/src/components/manage/Blocks/Group/EditBlockWrapper.jsx +0 -197
  25. package/src/components/manage/Blocks/Group/EditBlockWrapper.test.jsx +0 -58
package/.eslintrc.js CHANGED
@@ -3,6 +3,11 @@ const path = require('path');
3
3
  const projectRootPath = fs.realpathSync(__dirname + '/../../../');
4
4
 
5
5
  let voltoPath = path.join(projectRootPath, 'node_modules/@plone/volto');
6
+ const voltoSlatePath = fs.existsSync(
7
+ path.join(projectRootPath, 'node_modules/@plone/volto-slate/src'),
8
+ )
9
+ ? '@plone/volto-slate/src'
10
+ : '@plone/volto-slate/src';
6
11
  let configFile;
7
12
  if (fs.existsSync(`${projectRootPath}/tsconfig.json`))
8
13
  configFile = `${projectRootPath}/tsconfig.json`;
@@ -16,16 +21,16 @@ if (configFile) {
16
21
  voltoPath = `./${jsConfig.baseUrl}/${pathsConfig['@plone/volto'][0]}`;
17
22
  }
18
23
 
19
- const AddonConfigurationRegistry = require(`${voltoPath}/addon-registry.js`);
20
- const reg = new AddonConfigurationRegistry(projectRootPath);
24
+ const { AddonRegistry } = require('@plone/registry/addon-registry');
25
+ const { registry } = AddonRegistry.init(projectRootPath);
21
26
 
22
27
  // Extends ESlint configuration for adding the aliases to `src` directories in Volto addons
23
- const addonAliases = Object.keys(reg.packages).map((o) => [
28
+ const addonAliases = Object.keys(registry.packages).map((o) => [
24
29
  o,
25
- reg.packages[o].modulePath,
30
+ registry.packages[o].modulePath,
26
31
  ]);
27
32
 
28
- const addonExtenders = reg.getEslintExtenders().map((m) => require(m));
33
+ const addonExtenders = registry.getEslintExtenders().map((m) => require(m));
29
34
 
30
35
  const defaultConfig = {
31
36
  extends: `${voltoPath}/.eslintrc`,
@@ -34,7 +39,7 @@ const defaultConfig = {
34
39
  alias: {
35
40
  map: [
36
41
  ['@plone/volto', '@plone/volto/src'],
37
- ['@plone/volto-slate', '@plone/volto/packages/volto-slate/src'],
42
+ ['@plone/volto-slate', voltoSlatePath],
38
43
  ...addonAliases,
39
44
  ['@package', `${__dirname}/src`],
40
45
  ['@root', `${__dirname}/src`],
@@ -54,7 +59,7 @@ const defaultConfig = {
54
59
  allowReferrer: true,
55
60
  },
56
61
  ],
57
- }
62
+ },
58
63
  };
59
64
 
60
65
  const config = addonExtenders.reduce(
package/CHANGELOG.md CHANGED
@@ -4,7 +4,27 @@ All notable changes to this project will be documented in this file. Dates are d
4
4
 
5
5
  Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
6
6
 
7
- ### [9.0.0](https://github.com/eea/volto-group-block/compare/8.1.1...9.0.0) - 10 February 2026
7
+ ### [10.0.1](https://github.com/eea/volto-group-block/compare/10.0.0...10.0.1) - 8 April 2026
8
+
9
+ #### :bug: Bug Fixes
10
+
11
+ - fix: make test [Alin V. (Claudiu) - [`1af7fd8`](https://github.com/eea/volto-group-block/commit/1af7fd894df993e7651f009a599040f763354630)]
12
+
13
+ ## [10.0.0](https://github.com/eea/volto-group-block/compare/9.0.0...10.0.0) - 27 March 2026
14
+
15
+ #### :rocket: New Features
16
+
17
+ - feat: Volto 18 support - refs #287700 [Nilesh - [`eab0346`](https://github.com/eea/volto-group-block/commit/eab0346ec36eedc552958b744ae82927b88058cf)]
18
+
19
+ #### :house: Internal changes
20
+
21
+ - chore: [JENKINSFILE] add package version in sonarqube [valentinab25 - [`d21ab95`](https://github.com/eea/volto-group-block/commit/d21ab953c0e5b6e265419de4e2ce5bcdc31e04b6)]
22
+ - chore: [JENKINSFILE] use sonarqube branches [EEA Jenkins - [`0b919c4`](https://github.com/eea/volto-group-block/commit/0b919c40b87d52d416e14fda7a2ee816dc74c3d9)]
23
+
24
+ #### :hammer_and_wrench: Others
25
+
26
+ - tests: Fix Sonar Qube tags - refs #297339 [Alin Voinea - [`75babfe`](https://github.com/eea/volto-group-block/commit/75babfeaa1ee5f707803a24a532a28c969d94a19)]
27
+ ## [9.0.0](https://github.com/eea/volto-group-block/compare/8.1.1...9.0.0) - 10 February 2026
8
28
 
9
29
  #### :rocket: New Features
10
30
 
@@ -29,9 +49,16 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
29
49
 
30
50
  #### :house: Internal changes
31
51
 
52
+ - chore: [JENKINS] fix sonarqube tags [valentinab25 - [`6dbeeb3`](https://github.com/eea/volto-group-block/commit/6dbeeb3b42ee1e69692dcb466bbff921a54ddabb)]
32
53
 
33
54
  #### :hammer_and_wrench: Others
34
55
 
56
+ - Add Sonarqube tag using clms-frontend addons list [EEA Jenkins - [`8e153d3`](https://github.com/eea/volto-group-block/commit/8e153d34ef330adeb5b1ef7d96b2ff433ecec5ff)]
57
+ - Add Sonarqube tag using clms-frontend addons list [EEA Jenkins - [`405738f`](https://github.com/eea/volto-group-block/commit/405738f8f13a236ad89f5f9870316322b1522518)]
58
+ - Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`84d6509`](https://github.com/eea/volto-group-block/commit/84d6509edf1b0821bd8709cf603f1025f99d18ff)]
59
+ - Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`ffb8602`](https://github.com/eea/volto-group-block/commit/ffb860257444d9ca05412111081a1320def9ee78)]
60
+ - Add Sonarqube tag using clms-frontend addons list [EEA Jenkins - [`4bd723a`](https://github.com/eea/volto-group-block/commit/4bd723a108b4c9d6e78cc7c1ceec58573c57abf2)]
61
+ - Add Sonarqube tag using ied-frontend addons list [EEA Jenkins - [`4f803d3`](https://github.com/eea/volto-group-block/commit/4f803d38efffcdc87f0dc0173b4142d9398bd2db)]
35
62
  ### [7.1.1](https://github.com/eea/volto-group-block/compare/7.1.0...7.1.1) - 30 January 2025
36
63
 
37
64
  #### :house: Internal changes
@@ -59,6 +86,9 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
59
86
 
60
87
  #### :hammer_and_wrench: Others
61
88
 
89
+ - Add Sonarqube tag using insitu-frontend addons list [EEA Jenkins - [`e727ac6`](https://github.com/eea/volto-group-block/commit/e727ac6a8c1882b4e77a08fd0c5bb0a401cd3bdb)]
90
+ - Add Sonarqube tag using clms-frontend addons list [EEA Jenkins - [`75c2946`](https://github.com/eea/volto-group-block/commit/75c29460dc6c42bbb799c13a5a6ef2bb8f26ed5a)]
91
+ - Add Sonarqube tag using insitu-frontend addons list [EEA Jenkins - [`96f3133`](https://github.com/eea/volto-group-block/commit/96f31335cdda925daf3e5824f0a23121b0c9b3ef)]
62
92
  ### [6.4.0](https://github.com/eea/volto-group-block/compare/6.3.5...6.4.0) - 17 January 2024
63
93
 
64
94
  #### :rocket: New Features
@@ -73,6 +103,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
73
103
 
74
104
  #### :house: Internal changes
75
105
 
106
+ - chore: [JENKINS] Refactor automated testing [valentinab25 - [`616f6eb`](https://github.com/eea/volto-group-block/commit/616f6ebe0385d82a827c6679eabdcf4e92a18c11)]
76
107
 
77
108
  #### :hammer_and_wrench: Others
78
109
 
@@ -85,6 +116,11 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
85
116
  - Prettier [kreafox - [`0c5d2d1`](https://github.com/eea/volto-group-block/commit/0c5d2d1a494489663cc97c5dc0f4ad13c4b67c8d)]
86
117
  - test: mock useLocation [kreafox - [`746887f`](https://github.com/eea/volto-group-block/commit/746887fa0e778f2d4cbe86661fc8c38c8a4bafb5)]
87
118
  - test: mock useLocation [kreafox - [`a360401`](https://github.com/eea/volto-group-block/commit/a360401b8ee05e9cb54b253b0e605d0a040c8f78)]
119
+ - test: [JENKINS] Use java17 for sonarqube scanner [valentinab25 - [`25030fb`](https://github.com/eea/volto-group-block/commit/25030fbd69108f90df02130e5010e56398941ad2)]
120
+ - test: [JENKINS] Run cypress in started frontend container [valentinab25 - [`1517dbb`](https://github.com/eea/volto-group-block/commit/1517dbb81cf9128752d835ae59dc22b251f4b035)]
121
+ - test: [JENKINS] Add cpu limit on cypress docker [valentinab25 - [`b0ba5f9`](https://github.com/eea/volto-group-block/commit/b0ba5f9c6d37526411a7a984595ac624401f8ac5)]
122
+ - test: [JENKINS] Increase shm-size to cypress docker [valentinab25 - [`8dbdfeb`](https://github.com/eea/volto-group-block/commit/8dbdfeb89fe53c6dc2f476b183a53c9266ab2bdf)]
123
+ - test: [JENKINS] Improve cypress time [valentinab25 - [`d0324f4`](https://github.com/eea/volto-group-block/commit/d0324f4aad6d94233ca8ce3645ca5162f39d9834)]
88
124
  ### [6.3.4](https://github.com/eea/volto-group-block/compare/6.3.3...6.3.4) - 22 October 2023
89
125
 
90
126
  ### [6.3.3](https://github.com/eea/volto-group-block/compare/6.3.2...6.3.3) - 17 October 2023
@@ -132,6 +168,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
132
168
 
133
169
  - Release #39 from eea/develop [ichim-david - [`283e1e8`](https://github.com/eea/volto-group-block/commit/283e1e8dd1047415bae054cfd502d1691deaeb59)]
134
170
  - Release 6.3.0 [Alin Voinea - [`3d74bb5`](https://github.com/eea/volto-group-block/commit/3d74bb5342e3882e0ddee1aa8edab7e90949def6)]
171
+ - test: Fix eslint and yarn i18n [Alin Voinea - [`763f764`](https://github.com/eea/volto-group-block/commit/763f76448625e05b53a2bde86ca48dda0cb263cb)]
135
172
  - i18n: Add en [Alin Voinea - [`f3385cd`](https://github.com/eea/volto-group-block/commit/f3385cd33bfbe3efe514fd82fd140d17e33051e1)]
136
173
  - test: Update Makefile and docker-compose to align it with Jenkinsfile [valentinab25 - [`3aa996b`](https://github.com/eea/volto-group-block/commit/3aa996b4c115da6f37ca771f07f10d58fbfa33e8)]
137
174
  - fix eslint warnings [nileshgulia1 - [`cfdf2e9`](https://github.com/eea/volto-group-block/commit/cfdf2e900bcc456fa5a24ce7b03859170ad024ba)]
@@ -162,6 +199,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
162
199
 
163
200
  #### :house: Internal changes
164
201
 
202
+ - chore: [JENKINS] Deprecate circularity website [valentinab25 - [`ad30e83`](https://github.com/eea/volto-group-block/commit/ad30e832bb869b67dc4e64ed99590b51cb80ab75)]
165
203
 
166
204
  #### :hammer_and_wrench: Others
167
205
 
@@ -178,12 +216,19 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
178
216
 
179
217
  #### :hammer_and_wrench: Others
180
218
 
219
+ - Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`37ffae5`](https://github.com/eea/volto-group-block/commit/37ffae512967b36af22cbed208a3ec9e1ddc392b)]
181
220
  ## [6.0.0](https://github.com/eea/volto-group-block/compare/5.0.1...6.0.0) - 24 March 2023
182
221
 
183
222
  #### :hammer_and_wrench: Others
184
223
 
185
224
  - (feat): Possibility to copy/cut/paste blocks within section group block - refs #157469 [dobri1408 - [`e9fc098`](https://github.com/eea/volto-group-block/commit/e9fc09825ba2ae258feb77864491d97d94c585b4)]
225
+ - Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`db4b09a`](https://github.com/eea/volto-group-block/commit/db4b09a6c14a8b271dec0c766886ffbcc3fe205e)]
226
+ - Add Sonarqube tag using advisory-board-frontend addons list [EEA Jenkins - [`b8c2bf4`](https://github.com/eea/volto-group-block/commit/b8c2bf471868bb0394b2dbbf75ccb7917a9ef0bf)]
227
+ - Add Sonarqube tag using advisory-board-frontend addons list [EEA Jenkins - [`b343119`](https://github.com/eea/volto-group-block/commit/b3431196931fd568476fa8bf6fbc508e086229ae)]
186
228
  - test(Jenkins): Run tests and cypress with latest canary @plone/volto [Alin Voinea - [`2f42e7c`](https://github.com/eea/volto-group-block/commit/2f42e7c19a1da5a9c6a883cb4f101e8fa224ff94)]
229
+ - Add Sonarqube tag using cca-frontend addons list [EEA Jenkins - [`73afcc2`](https://github.com/eea/volto-group-block/commit/73afcc2f417797cedaa78cceefb007001d6c2406)]
230
+ - yarn 3 [Alin Voinea - [`3c00ccc`](https://github.com/eea/volto-group-block/commit/3c00ccc7110bbf12a4d268182313418fb46b1a5d)]
231
+ - Add Sonarqube tag using demo-kitkat-frontend addons list [EEA Jenkins - [`9b9662b`](https://github.com/eea/volto-group-block/commit/9b9662bda1da70ba0c3a7b4b05cebf130ed89e9e)]
187
232
  ### [5.0.1](https://github.com/eea/volto-group-block/compare/5.0.0...5.0.1) - 16 November 2022
188
233
 
189
234
  #### :nail_care: Enhancements
@@ -200,6 +245,8 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
200
245
 
201
246
  - Prepare 5.0.0 release [Miu Razvan - [`88c0ddd`](https://github.com/eea/volto-group-block/commit/88c0ddd569aeda7ee34d1eadea6a087f4e7dc257)]
202
247
  - Update dependencies [Alin Voinea - [`c8405af`](https://github.com/eea/volto-group-block/commit/c8405afb830cdf62e7877bf30b619933519e1d71)]
248
+ - Add Sonarqube tag using marine-frontend addons list [EEA Jenkins - [`18e26c6`](https://github.com/eea/volto-group-block/commit/18e26c6939706d572ab8574e9b1826b9abc76314)]
249
+ - Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`8ed6d21`](https://github.com/eea/volto-group-block/commit/8ed6d21d8489911cc4cb471e3f8823c35f4adc50)]
203
250
  ### [4.3.8](https://github.com/eea/volto-group-block/compare/4.3.7...4.3.8) - 26 August 2022
204
251
 
205
252
  ### [4.3.7](https://github.com/eea/volto-group-block/compare/4.3.6...4.3.7) - 22 August 2022
@@ -212,6 +259,9 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
212
259
 
213
260
  #### :hammer_and_wrench: Others
214
261
 
262
+ - Add Sonarqube tag using circularity-frontend addons list [EEA Jenkins - [`4e73f8b`](https://github.com/eea/volto-group-block/commit/4e73f8be3c73559557efadc410cb56abc055d82d)]
263
+ - Add Sonarqube tag using clms-frontend addons list [EEA Jenkins - [`3040335`](https://github.com/eea/volto-group-block/commit/3040335002c63b50208c95918413bc958150e7a9)]
264
+ - Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`386f730`](https://github.com/eea/volto-group-block/commit/386f730ed65f73fe1468b9b77351c97fb70edcc5)]
215
265
  ### [4.3.5](https://github.com/eea/volto-group-block/compare/4.3.4...4.3.5) - 4 January 2022
216
266
 
217
267
  ### [4.3.4](https://github.com/eea/volto-group-block/compare/4.3.3...4.3.4) - 3 January 2022
@@ -220,15 +270,23 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
220
270
 
221
271
  #### :hammer_and_wrench: Others
222
272
 
273
+ - Add Sonarqube tag using freshwater-frontend addons list [EEA Jenkins - [`3e62d79`](https://github.com/eea/volto-group-block/commit/3e62d79a7ed37d10d623bc845d43e1144f8080f7)]
223
274
  ### [4.3.2](https://github.com/eea/volto-group-block/compare/4.3.1...4.3.2) - 10 December 2021
224
275
 
225
276
  #### :hammer_and_wrench: Others
226
277
 
227
278
  - Refs #142010 - Optimize Volto-addons gitflow pipelines [valentinab25 - [`bc36cf5`](https://github.com/eea/volto-group-block/commit/bc36cf58c39e2b43c2fbf5189df6ddefc1260857)]
279
+ - Add Sonarqube tag using industry-frontend addons list [EEA Jenkins - [`8038e78`](https://github.com/eea/volto-group-block/commit/8038e783c1e8ddd71e21f72070fdfa8e7e098993)]
280
+ - Add Sonarqube tag using clms-frontend addons list [EEA Jenkins - [`daccdbc`](https://github.com/eea/volto-group-block/commit/daccdbc733e47be7d6536eb67f8f2eea038dc94b)]
228
281
  ### [4.3.1](https://github.com/eea/volto-group-block/compare/4.3.0...4.3.1) - 11 October 2021
229
282
 
230
283
  #### :hammer_and_wrench: Others
231
284
 
285
+ - Add Sonarqube tag using bise-frontend addons list [EEA Jenkins - [`b0092e4`](https://github.com/eea/volto-group-block/commit/b0092e4f78a1a0184e22e32bb9806cd57417dfb2)]
286
+ - Add Sonarqube tag using sustainability-frontend addons list [EEA Jenkins - [`ff8889c`](https://github.com/eea/volto-group-block/commit/ff8889cb7b0761b1df43b201984ce40b14e1561b)]
287
+ - Add Sonarqube tag using climate-energy-frontend addons list [EEA Jenkins - [`0375c28`](https://github.com/eea/volto-group-block/commit/0375c28ed1ffe9186a4790b454795c0ca8039f72)]
288
+ - Add Sonarqube tag using ims-frontend addons list [EEA Jenkins - [`c392190`](https://github.com/eea/volto-group-block/commit/c392190f044f5d9397bd2fb8c3d6a357f84960d0)]
289
+ - Add Sonarqube tag using frontend addons list [EEA Jenkins - [`9694501`](https://github.com/eea/volto-group-block/commit/9694501141e6780eba89464d36406e3c93629fd8)]
232
290
  ### [4.3.0](https://github.com/eea/volto-group-block/compare/4.2.3...4.3.0) - 24 June 2021
233
291
 
234
292
  #### :hammer_and_wrench: Others
@@ -344,6 +402,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
344
402
  - Release 1.0.0 [Alin Voinea - [`b6ef873`](https://github.com/eea/volto-group-block/commit/b6ef873cb6f61e17db66fdd4de1d9d4902a66fc6)]
345
403
  - Update package meta info [Alin Voinea - [`143b7d4`](https://github.com/eea/volto-group-block/commit/143b7d44438d7afa5e346a9d21a85352df4e925f)]
346
404
  - Add Jenkinkins pipeline [Alin Voinea - [`866a4e1`](https://github.com/eea/volto-group-block/commit/866a4e14ea1eb8f5adb01222e576e5ab6dc73a70)]
405
+ - yarn prettier [Alin Voinea - [`e3fe0a3`](https://github.com/eea/volto-group-block/commit/e3fe0a36b89878769341b45198d6c9e2f2584d15)]
347
406
  ### [0.1.3](https://github.com/eea/volto-group-block/compare/0.1.2...0.1.3) - 9 November 2020
348
407
 
349
408
  #### :hammer_and_wrench: Others
@@ -383,4 +442,5 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
383
442
  - Render meta block [Alin Voinea - [`0d44560`](https://github.com/eea/volto-group-block/commit/0d4456011ca56454068a54c610250b02df4ccb3b)]
384
443
  - Implement meta block allowedBlocks settings [Alin Voinea - [`f24feb1`](https://github.com/eea/volto-group-block/commit/f24feb1a1751f04841c21c7cd52a517fb02074ba)]
385
444
  - Edit meta block [Alin Voinea - [`236d291`](https://github.com/eea/volto-group-block/commit/236d29156fa835a7aa54eecdb4f120de0d64b271)]
445
+ - yarn bootstrap [Alin Voinea - [`e009dfb`](https://github.com/eea/volto-group-block/commit/e009dfb6b9b74d101a6722f0982a5359fc522b6b)]
386
446
  - Initial commit [Alin Voinea - [`6a7b0de`](https://github.com/eea/volto-group-block/commit/6a7b0deb8f873d1462fd6a9c61edfc1562b3aace)]
package/DEVELOP.md CHANGED
@@ -12,6 +12,8 @@
12
12
  make start
13
13
  ```
14
14
 
15
+ `make start` defaults to Volto 18. Use `make VOLTO_VERSION=17 start` to test the Volto 17 dev environment.
16
+
15
17
  1. Wait for `Volto started at 0.0.0.0:3000` meesage
16
18
 
17
19
  1. Go to http://localhost:3000
@@ -26,21 +28,20 @@
26
28
 
27
29
  ### Or add @eeacms/volto-group-block to your Volto project
28
30
 
29
- Before starting make sure your development environment is properly set. See [Volto Developer Documentation](https://docs.voltocms.com/getting-started/install/)
30
-
31
- 1. Make sure you have installed `yo`, `@plone/generator-volto` and `mrs-developer`
31
+ Before starting make sure your development environment is properly set. See the official Plone documentation for [creating a project with Cookieplone](https://6.docs.plone.org/install/create-project-cookieplone.html) and [installing an add-on in development mode in Volto 18 and 19](https://6.docs.plone.org/volto/development/add-ons/install-an-add-on-dev-18.html).
32
32
 
33
- npm install -g yo @plone/generator-volto mrs-developer
33
+ For new Volto 18+ projects, use Cookieplone. It includes `mrs-developer` by default.
34
34
 
35
- 1. Create new volto app
35
+ 1. Create a new Volto project with Cookieplone
36
36
 
37
- yo @plone/volto my-volto-project --addon @eeacms/volto-group-block --skip-install
38
- cd my-volto-project
37
+ uvx cookieplone project
38
+ cd project-title
39
39
 
40
40
  1. Add the following to `mrs.developer.json`:
41
41
 
42
42
  {
43
43
  "volto-group-block": {
44
+ "output": "packages",
44
45
  "url": "https://github.com/eea/volto-group-block.git",
45
46
  "package": "@eeacms/volto-group-block",
46
47
  "branch": "develop",
@@ -48,28 +49,31 @@ Before starting make sure your development environment is properly set. See [Vol
48
49
  }
49
50
  }
50
51
 
51
- 1. Install
52
+ 1. Add `@eeacms/volto-group-block` to the `addons` key in your project `volto.config.js`
53
+
54
+ 1. Install or refresh the project setup
52
55
 
53
- make develop
54
- yarn
56
+ make install
55
57
 
56
- 1. Start backend
58
+ 1. Start backend in one terminal
57
59
 
58
- docker run --pull always -it --rm --name plone -p 8080:8080 -e SITE=Plone plone/plone-backend
60
+ make backend-start
59
61
 
60
- ...wait for backend to setup and start - `Ready to handle requests`:
62
+ ...wait for backend to setup and start, ending with `Ready to handle requests`
61
63
 
62
64
  ...you can also check http://localhost:8080/Plone
63
65
 
64
- 1. Start frontend
66
+ 1. Start frontend in a second terminal
65
67
 
66
- yarn start
68
+ make frontend-start
67
69
 
68
70
  1. Go to http://localhost:3000
69
71
 
70
72
  1. Happy hacking!
71
73
 
72
- cd src/addons/volto-group-block/
74
+ cd packages/volto-group-block
75
+
76
+ For legacy Volto 17 projects, keep using the yarn-based workflow from the Volto 17 documentation.
73
77
 
74
78
  ## Cypress
75
79
 
@@ -81,7 +85,7 @@ project where you added `volto-group-block` to `mrs.developer.json`
81
85
  Go to:
82
86
 
83
87
  ```BASH
84
- cd src/addons/volto-group-block/
88
+ cd packages/volto-group-block/
85
89
  ```
86
90
 
87
91
  Start:
@@ -93,6 +97,8 @@ Start:
93
97
 
94
98
  This will build and start with Docker a clean `Plone backend` and `Volto Frontend` with `volto-group-block` block installed.
95
99
 
100
+ Use `make VOLTO_VERSION=17 start` if you need to reproduce the Volto 17 setup locally.
101
+
96
102
  Open Cypress Interface:
97
103
 
98
104
  ```Bash
package/README.md CHANGED
@@ -3,16 +3,16 @@
3
3
  [![Releases](https://img.shields.io/github/v/release/eea/volto-group-block)](https://github.com/eea/volto-group-block/releases)
4
4
 
5
5
  [![Pipeline](https://ci.eionet.europa.eu/buildStatus/icon?job=volto-addons%2Fvolto-group-block%2Fmaster&subject=master)](https://ci.eionet.europa.eu/view/Github/job/volto-addons/job/volto-group-block/job/master/display/redirect)
6
- [![Lines of Code](https://sonarqube.eea.europa.eu/api/project_badges/measure?project=volto-group-block-master&metric=ncloc)](https://sonarqube.eea.europa.eu/dashboard?id=volto-group-block-master)
7
- [![Coverage](https://sonarqube.eea.europa.eu/api/project_badges/measure?project=volto-group-block-master&metric=coverage)](https://sonarqube.eea.europa.eu/dashboard?id=volto-group-block-master)
8
- [![Bugs](https://sonarqube.eea.europa.eu/api/project_badges/measure?project=volto-group-block-master&metric=bugs)](https://sonarqube.eea.europa.eu/dashboard?id=volto-group-block-master)
9
- [![Duplicated Lines (%)](https://sonarqube.eea.europa.eu/api/project_badges/measure?project=volto-group-block-master&metric=duplicated_lines_density)](https://sonarqube.eea.europa.eu/dashboard?id=volto-group-block-master)
6
+ [![Lines of Code](https://sonarqube.eea.europa.eu/api/project_badges/measure?project=volto-group-block&metric=ncloc)](https://sonarqube.eea.europa.eu/dashboard?id=volto-group-block)
7
+ [![Coverage](https://sonarqube.eea.europa.eu/api/project_badges/measure?project=volto-group-block&metric=coverage)](https://sonarqube.eea.europa.eu/dashboard?id=volto-group-block)
8
+ [![Bugs](https://sonarqube.eea.europa.eu/api/project_badges/measure?project=volto-group-block&metric=bugs)](https://sonarqube.eea.europa.eu/dashboard?id=volto-group-block)
9
+ [![Duplicated Lines (%)](https://sonarqube.eea.europa.eu/api/project_badges/measure?project=volto-group-block&metric=duplicated_lines_density)](https://sonarqube.eea.europa.eu/dashboard?id=volto-group-block)
10
10
 
11
11
  [![Pipeline](https://ci.eionet.europa.eu/buildStatus/icon?job=volto-addons%2Fvolto-group-block%2Fdevelop&subject=develop)](https://ci.eionet.europa.eu/view/Github/job/volto-addons/job/volto-group-block/job/develop/display/redirect)
12
- [![Lines of Code](https://sonarqube.eea.europa.eu/api/project_badges/measure?project=volto-group-block-develop&metric=ncloc)](https://sonarqube.eea.europa.eu/dashboard?id=volto-group-block-develop)
13
- [![Coverage](https://sonarqube.eea.europa.eu/api/project_badges/measure?project=volto-group-block-develop&metric=coverage)](https://sonarqube.eea.europa.eu/dashboard?id=volto-group-block-develop)
14
- [![Bugs](https://sonarqube.eea.europa.eu/api/project_badges/measure?project=volto-group-block-develop&metric=bugs)](https://sonarqube.eea.europa.eu/dashboard?id=volto-group-block-develop)
15
- [![Duplicated Lines (%)](https://sonarqube.eea.europa.eu/api/project_badges/measure?project=volto-group-block-develop&metric=duplicated_lines_density)](https://sonarqube.eea.europa.eu/dashboard?id=volto-group-block-develop)
12
+ [![Lines of Code](https://sonarqube.eea.europa.eu/api/project_badges/measure?project=volto-group-block&branch=develop&metric=ncloc)](https://sonarqube.eea.europa.eu/dashboard?id=volto-group-block&branch=develop)
13
+ [![Coverage](https://sonarqube.eea.europa.eu/api/project_badges/measure?project=volto-group-block&branch=develop&metric=coverage)](https://sonarqube.eea.europa.eu/dashboard?id=volto-group-block&branch=develop)
14
+ [![Bugs](https://sonarqube.eea.europa.eu/api/project_badges/measure?project=volto-group-block&branch=develop&metric=bugs)](https://sonarqube.eea.europa.eu/dashboard?id=volto-group-block&branch=develop)
15
+ [![Duplicated Lines (%)](https://sonarqube.eea.europa.eu/api/project_badges/measure?project=volto-group-block&branch=develop&metric=duplicated_lines_density)](https://sonarqube.eea.europa.eu/dashboard?id=volto-group-block&branch=develop)
16
16
 
17
17
  [Volto](https://github.com/plone/volto) add-on to group blocks in sections and filter available blocks per content-type per section
18
18
 
@@ -20,6 +20,18 @@
20
20
 
21
21
  ![Group blocks and restrict available blocks](https://raw.githubusercontent.com/eea/volto-group-block/master/docs/volto-group-block.gif)
22
22
 
23
+ ## Upgrade
24
+
25
+ ### Upgrading to 10.x
26
+
27
+ > This version requires `Volto >= 17.18` or `Volto 18+`. It removes the custom `EditBlockWrapper` and uses Volto's built-in block chrome provided by `BlocksForm`.
28
+
29
+ #### Breaking changes
30
+
31
+ - **Removed `EditBlockWrapper.jsx`.** Any code importing `EditBlockWrapper` from `@eeacms/volto-group-block` will break. Use Volto's built-in `EditBlockWrapper` from `@plone/volto/components/manage/Blocks/Block/EditBlockWrapper` if you need a custom wrapper.
32
+ - **Removed the "Section help" button.** The `?` icon that appeared in the inner block toolbar and opened the sidebar to display editing instructions has been removed. The `instructions` field is still available in the group block schema and still rendered in the sidebar panel, but there is no longer a per-block shortcut button to reveal it.
33
+ - **`disableInnerButtons`** is now implemented via a CSS class (`.disable-inner-buttons`) instead of a JS-level `disabled` prop on the removed wrapper.
34
+
23
35
  ## Getting started
24
36
 
25
37
  ### Try volto-group-block with Docker
@@ -31,6 +43,11 @@
31
43
 
32
44
  Go to http://localhost:3000
33
45
 
46
+ `make start` now defaults to Volto 18. To run the same setup against Volto 17, use:
47
+
48
+ VOLTO_VERSION=17 make
49
+ VOLTO_VERSION=17 make start
50
+
34
51
  ### Add volto-group-block to your Volto project
35
52
 
36
53
  1. Make sure you have a [Plone backend](https://plone.org/download) up-and-running at http://localhost:8080/Plone
@@ -44,30 +61,39 @@ Go to http://localhost:3000
44
61
  * If you already have a volto project, just update `package.json`:
45
62
 
46
63
  ```JSON
47
- "addons": [
48
- "@eeacms/volto-group-block"
49
- ],
50
-
51
64
  "dependencies": {
52
65
  "@eeacms/volto-group-block": "*"
53
66
  }
54
67
  ```
55
68
 
56
- * If not, create one:
69
+ and `volto.config.js`:
57
70
 
71
+ ```JavaScript
72
+ const addons = ['@eeacms/volto-group-block'];
58
73
  ```
59
- npm install -g yo @plone/generator-volto
60
- yo @plone/volto my-volto-project --canary --addon @eeacms/volto-group-block
61
- cd my-volto-project
74
+
75
+ * If not, create one with Cookieplone, as recommended by the official Plone documentation for Volto 18+:
76
+
77
+ ```
78
+ uvx cookieplone project
79
+ cd project-title
80
+ ```
81
+
82
+ 1. Install or update dependencies, then start the project:
83
+
84
+ ```
85
+ make install
62
86
  ```
63
87
 
64
- 1. Install new add-ons and restart Volto:
88
+ For a Cookieplone project, start the backend and frontend in separate terminals:
65
89
 
66
90
  ```
67
- yarn
68
- yarn start
91
+ make backend-start
92
+ make frontend-start
69
93
  ```
70
94
 
95
+ For a legacy Volto 17 project, install the package with `yarn` and restart the frontend as usual.
96
+
71
97
  1. Go to http://localhost:3000
72
98
 
73
99
  1. Happy editing!
package/cypress.config.js CHANGED
@@ -1,9 +1,18 @@
1
1
  const { defineConfig } = require('cypress');
2
2
 
3
+ const apiPath =
4
+ process.env.CYPRESS_API_PATH ||
5
+ process.env.RAZZLE_DEV_PROXY_API_PATH ||
6
+ process.env.RAZZLE_INTERNAL_API_PATH ||
7
+ 'http://localhost:8080/Plone';
8
+
3
9
  module.exports = defineConfig({
4
10
  viewportWidth: 1280,
5
11
  defaultCommandTimeout: 8888,
6
12
  chromeWebSecurity: false,
13
+ env: {
14
+ API_PATH: apiPath,
15
+ },
7
16
  reporter: 'junit',
8
17
  video: false,
9
18
  retries: {
package/docker-compose.yml CHANGED
@@ -15,7 +15,7 @@ services:
15
15
  args:
16
16
  ADDON_NAME: "${ADDON_NAME}"
17
17
  ADDON_PATH: "${ADDON_PATH}"
18
- VOLTO_VERSION: ${VOLTO_VERSION:-16}
18
+ VOLTO_VERSION: ${VOLTO_VERSION:-18-yarn}
19
19
  ports:
20
20
  - "3000:3000"
21
21
  - "3001:3001"
package/jest-addon.config.js CHANGED
@@ -1,4 +1,12 @@
1
1
  require('dotenv').config({ path: __dirname + '/.env' })
2
+ const fs = require('fs')
3
+ const path = require('path')
4
+
5
+ const voltoSlatePath = fs.existsSync(
6
+ path.join(__dirname, '../../../node_modules/@plone/volto-slate/src'),
7
+ )
8
+ ? '<rootDir>/node_modules/@plone/volto-slate/src'
9
+ : '<rootDir>/node_modules/@plone/volto/packages/volto-slate/src'
2
10
 
3
11
  module.exports = {
4
12
  testMatch: ['**/src/addons/**/?(*.)+(spec|test).[jt]s?(x)'],
@@ -17,10 +25,8 @@ module.exports = {
17
25
  '@eeacms/search/(.*)$': '<rootDir>/src/addons/volto-searchlib/searchlib/$1',
18
26
  '@eeacms/search': '<rootDir>/src/addons/volto-searchlib/searchlib',
19
27
  '@eeacms/(.*?)/(.*)$': '<rootDir>/node_modules/@eeacms/$1/src/$2',
20
- '@plone/volto-slate$':
21
- '<rootDir>/node_modules/@plone/volto/packages/volto-slate/src',
22
- '@plone/volto-slate/(.*)$':
23
- '<rootDir>/node_modules/@plone/volto/packages/volto-slate/src/$1',
28
+ '@plone/volto-slate$': voltoSlatePath,
29
+ '@plone/volto-slate/(.*)$': `${voltoSlatePath}/$1`,
24
30
  '~/(.*)$': '<rootDir>/src/$1',
25
31
  'load-volto-addons':
26
32
  '<rootDir>/node_modules/@plone/volto/jest-addons-loader.js',
package/locales/de/LC_MESSAGES/volto.po CHANGED
@@ -21,16 +21,6 @@ msgstr "Abschnitt (Gruppe)"
21
21
  msgid "SectionGroupSettings"
22
22
  msgstr "Abschnitt (Gruppe) Einstellungen"
23
23
 
24
- #. Default: "Unknown Block {block}"
25
- #: components/manage/Blocks/Group/EditBlockWrapper
26
- msgid "Unknown Block"
27
- msgstr "Unbekannter Block {block}"
28
-
29
- #. Default: "Add block"
30
- #: components/manage/Blocks/Group/EditBlockWrapper
31
- msgid "addBlock"
32
- msgstr "Block hinzufügen"
33
-
34
24
  #. Default: "Select HTML5 element to be used for this block"
35
25
  #: components/manage/Blocks/Group/EditSchema
36
26
  msgid "asPropertyDescription"
@@ -41,21 +31,11 @@ msgstr "Wählen Sie das HTML5-Element, das für diesen Block verwendet werden so
41
31
  msgid "asPropertyTitle"
42
32
  msgstr ""
43
33
 
44
- #. Default: "delete"
45
- #: components/manage/Blocks/Group/EditBlockWrapper
46
- msgid "delete"
47
- msgstr "Löschen"
48
-
49
34
  #. Default: "Default"
50
35
  #: components/manage/Blocks/Group/EditSchema
51
36
  msgid "fieldsetDefaultTitle"
52
37
  msgstr "Standard"
53
38
 
54
- #. Default: "Remove block"
55
- #: components/manage/Blocks/Group/EditBlockWrapper
56
- msgid "removeBlock"
57
- msgstr "Block entfernen"
58
-
59
39
  #. Default: "Section block"
60
40
  #: components/manage/Blocks/Group/EditSchema
61
41
  msgid "sectionBlock"
package/locales/en/LC_MESSAGES/volto.po CHANGED
@@ -21,16 +21,6 @@ msgstr ""
21
21
  msgid "SectionGroupSettings"
22
22
  msgstr ""
23
23
 
24
- #. Default: "Unknown Block {block}"
25
- #: components/manage/Blocks/Group/EditBlockWrapper
26
- msgid "Unknown Block"
27
- msgstr ""
28
-
29
- #. Default: "Add block"
30
- #: components/manage/Blocks/Group/EditBlockWrapper
31
- msgid "addBlock"
32
- msgstr ""
33
-
34
24
  #. Default: "Select HTML5 element to be used for this block"
35
25
  #: components/manage/Blocks/Group/EditSchema
36
26
  msgid "asPropertyDescription"
@@ -41,21 +31,11 @@ msgstr ""
41
31
  msgid "asPropertyTitle"
42
32
  msgstr ""
43
33
 
44
- #. Default: "delete"
45
- #: components/manage/Blocks/Group/EditBlockWrapper
46
- msgid "delete"
47
- msgstr ""
48
-
49
34
  #. Default: "Default"
50
35
  #: components/manage/Blocks/Group/EditSchema
51
36
  msgid "fieldsetDefaultTitle"
52
37
  msgstr ""
53
38
 
54
- #. Default: "Remove block"
55
- #: components/manage/Blocks/Group/EditBlockWrapper
56
- msgid "removeBlock"
57
- msgstr ""
58
-
59
39
  #. Default: "Section block"
60
40
  #: components/manage/Blocks/Group/EditSchema
61
41
  msgid "sectionBlock"
package/locales/it/LC_MESSAGES/volto.po CHANGED
@@ -21,16 +21,6 @@ msgstr ""
21
21
  msgid "SectionGroupSettings"
22
22
  msgstr ""
23
23
 
24
- #. Default: "Unknown Block {block}"
25
- #: components/manage/Blocks/Group/EditBlockWrapper
26
- msgid "Unknown Block"
27
- msgstr ""
28
-
29
- #. Default: "Add block"
30
- #: components/manage/Blocks/Group/EditBlockWrapper
31
- msgid "addBlock"
32
- msgstr ""
33
-
34
24
  #. Default: "Select HTML5 element to be used for this block"
35
25
  #: components/manage/Blocks/Group/EditSchema
36
26
  msgid "asPropertyDescription"
@@ -41,21 +31,11 @@ msgstr ""
41
31
  msgid "asPropertyTitle"
42
32
  msgstr ""
43
33
 
44
- #. Default: "delete"
45
- #: components/manage/Blocks/Group/EditBlockWrapper
46
- msgid "delete"
47
- msgstr ""
48
-
49
34
  #. Default: "Default"
50
35
  #: components/manage/Blocks/Group/EditSchema
51
36
  msgid "fieldsetDefaultTitle"
52
37
  msgstr ""
53
38
 
54
- #. Default: "Remove block"
55
- #: components/manage/Blocks/Group/EditBlockWrapper
56
- msgid "removeBlock"
57
- msgstr ""
58
-
59
39
  #. Default: "Section block"
60
40
  #: components/manage/Blocks/Group/EditSchema
61
41
  msgid "sectionBlock"
package/locales/ro/LC_MESSAGES/volto.po CHANGED
@@ -21,16 +21,6 @@ msgstr ""
21
21
  msgid "SectionGroupSettings"
22
22
  msgstr ""
23
23
 
24
- #. Default: "Unknown Block {block}"
25
- #: components/manage/Blocks/Group/EditBlockWrapper
26
- msgid "Unknown Block"
27
- msgstr ""
28
-
29
- #. Default: "Add block"
30
- #: components/manage/Blocks/Group/EditBlockWrapper
31
- msgid "addBlock"
32
- msgstr ""
33
-
34
24
  #. Default: "Select HTML5 element to be used for this block"
35
25
  #: components/manage/Blocks/Group/EditSchema
36
26
  msgid "asPropertyDescription"
@@ -41,21 +31,11 @@ msgstr ""
41
31
  msgid "asPropertyTitle"
42
32
  msgstr ""
43
33
 
44
- #. Default: "delete"
45
- #: components/manage/Blocks/Group/EditBlockWrapper
46
- msgid "delete"
47
- msgstr ""
48
-
49
34
  #. Default: "Default"
50
35
  #: components/manage/Blocks/Group/EditSchema
51
36
  msgid "fieldsetDefaultTitle"
52
37
  msgstr ""
53
38
 
54
- #. Default: "Remove block"
55
- #: components/manage/Blocks/Group/EditBlockWrapper
56
- msgid "removeBlock"
57
- msgstr ""
58
-
59
39
  #. Default: "Section block"
60
40
  #: components/manage/Blocks/Group/EditSchema
61
41
  msgid "sectionBlock"