@eeacms/volto-eea-website-theme 2.1.1 → 2.1.3

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.
package/CHANGELOG.md CHANGED
@@ -4,6 +4,23 @@ 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
+ ### [2.1.3](https://github.com/eea/volto-eea-website-theme/compare/2.1.2...2.1.3) - 22 July 2024
8
+
9
+ ### [2.1.2](https://github.com/eea/volto-eea-website-theme/compare/2.1.1...2.1.2) - 14 June 2024
10
+
11
+ #### :house: Internal changes
12
+
13
+ - style: Automated code fix [eea-jenkins - [`802d84b`](https://github.com/eea/volto-eea-website-theme/commit/802d84bdcca495edf59c18ff79b0827b310f555f)]
14
+
15
+ #### :hammer_and_wrench: Others
16
+
17
+ - Refs #269520 - import TokenWidgetEdit [Tripon Eugen - [`956141c`](https://github.com/eea/volto-eea-website-theme/commit/956141cbeafd84938742b920ba40ad599eec1b19)]
18
+ - Refs #269520 - import TokenWidgetEdit [Tripon Eugen - [`4ef7b18`](https://github.com/eea/volto-eea-website-theme/commit/4ef7b18ca0437bb664ec83e03a2c07e22e87f0e7)]
19
+ - Fix test [Tiberiu Ichim - [`e51380f`](https://github.com/eea/volto-eea-website-theme/commit/e51380f20129d44984ba4249227e24fceb857f7e)]
20
+ - Refs #269520 - other_organisation test [Tripon Eugen - [`7558b27`](https://github.com/eea/volto-eea-website-theme/commit/7558b27a9d1cd6d3480a32b296c7325c796006c9)]
21
+ - Refs #269520 - other_organisation token widget edit mode [Tripon Eugen - [`b6df127`](https://github.com/eea/volto-eea-website-theme/commit/b6df127bd91b6f55dda8f468e1107037d43752ff)]
22
+ - Refs #269520 - other_organisation token widget [Tripon Eugen - [`6fd7543`](https://github.com/eea/volto-eea-website-theme/commit/6fd7543894bd2c593a1729116befd95c82ea3c8f)]
23
+ - Add Sonarqube tag using marine-frontend addons list [EEA Jenkins - [`cbc36c7`](https://github.com/eea/volto-eea-website-theme/commit/cbc36c74dfcd5f7cb1013a4c673d9c02e0023766)]
7
24
  ### [2.1.1](https://github.com/eea/volto-eea-website-theme/compare/2.1.0...2.1.1) - 28 May 2024
8
25
 
9
26
  #### :bug: Bug Fixes
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@eeacms/volto-eea-website-theme",
3
- "version": "2.1.1",
3
+ "version": "2.1.3",
4
4
  "description": "@eeacms/volto-eea-website-theme: Volto add-on",
5
5
  "main": "src/index.js",
6
6
  "author": "European Environment Agency: IDM2 A-Team",
@@ -29,6 +29,7 @@ const UniversalLink = ({
29
29
  const token = useSelector((state) => state.userSession?.token);
30
30
 
31
31
  let url = href;
32
+
32
33
  if (!href && item) {
33
34
  if (!item['@id']) {
34
35
  // eslint-disable-next-line no-console
@@ -51,10 +52,10 @@ const UniversalLink = ({
51
52
 
52
53
  //case: item of type 'File'
53
54
  if (
54
- !token &&
55
+ download &&
55
56
  config.settings.downloadableObjects.includes(item['@type'])
56
57
  ) {
57
- url = `${url}/@@download/file`;
58
+ url = url.includes('/@@download/file') ? url : `${url}/@@download/file`;
58
59
  }
59
60
 
60
61
  if (
@@ -68,10 +69,10 @@ const UniversalLink = ({
68
69
 
69
70
  const isExternal = !isInternalURL(url);
70
71
 
71
- const isDownload = (!isExternal && url.includes('@@download')) || download;
72
+ const isDownload = !isExternal && url && url.includes('@@download/file');
73
+
72
74
  const isDisplayFile =
73
75
  (!isExternal && url.includes('@@display-file')) || false;
74
-
75
76
  const checkedURL = URLUtils.checkAndNormalizeUrl(url);
76
77
 
77
78
  // we can receive an item with a linkWithHash property set from ObjectBrowserWidget
package/src/index.js CHANGED
@@ -9,6 +9,7 @@ import { TopicsWidget } from '@eeacms/volto-eea-website-theme/components/theme/W
9
9
  import CreatableSelectWidget from '@eeacms/volto-eea-website-theme/components/theme/Widgets/CreatableSelectWidget';
10
10
 
11
11
  import { Icon } from '@plone/volto/components';
12
+ import { default as TokenWidgetEdit } from '@plone/volto/components/manage/Widgets/TokenWidget';
12
13
  import { serializeNodesToText } from '@plone/volto-slate/editor/render';
13
14
  import Tag from '@eeacms/volto-eea-design-system/ui/Tag/Tag';
14
15
 
@@ -329,6 +330,7 @@ const applyConfig = (config) => {
329
330
  }
330
331
 
331
332
  // Custom Widgets
333
+ config.widgets.id.other_organisations = TokenWidgetEdit;
332
334
  config.widgets.views.id.topics = TopicsWidget;
333
335
  config.widgets.views.id.subjects = TokenWidget;
334
336
  config.widgets.views.widget.tags = TokenWidget;
package/src/index.test.js CHANGED
@@ -92,6 +92,7 @@ describe('applyConfig', () => {
92
92
  },
93
93
  },
94
94
  widget: {},
95
+ id: {},
95
96
  },
96
97
  settings: {
97
98
  eea: {
@@ -245,6 +246,7 @@ describe('applyConfig', () => {
245
246
  },
246
247
  },
247
248
  widget: {},
249
+ id: {},
248
250
  },
249
251
  settings: {
250
252
  eea: {},