@eeacms/volto-datahub 1.0.31 → 1.0.33

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.
@@ -5,8 +5,10 @@ const projectRootPath = fs.existsSync('./project')
5
5
  ? fs.realpathSync('./project')
6
6
  : fs.realpathSync('./../../../');
7
7
  const packageJson = require(path.join(projectRootPath, 'package.json'));
8
- const jsConfig = require(path.join(projectRootPath, 'jsconfig.json'))
9
- .compilerOptions;
8
+ const jsConfig = require(path.join(
9
+ projectRootPath,
10
+ 'jsconfig.json',
11
+ )).compilerOptions;
10
12
 
11
13
  const pathsConfig = jsConfig.paths;
12
14
 
@@ -50,4 +52,7 @@ module.exports = {
50
52
  },
51
53
  },
52
54
  },
55
+ rules: {
56
+ 'react/jsx-no-target-blank': 'off',
57
+ },
53
58
  };
package/CHANGELOG.md CHANGED
@@ -4,6 +4,39 @@ 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
+ ### [1.0.33](https://github.com/eea/volto-datahub/compare/1.0.32...1.0.33) - 12 March 2024
8
+
9
+ #### :boom: Breaking Change
10
+
11
+ - breaking(webpack): removed path import as webpack 5 no longer patches node modules to use in the browser [David Ichim - [`76f3538`](https://github.com/eea/volto-datahub/commit/76f353869b4ba8c687c97c140fa43db236b55188)]
12
+
13
+ #### :house: Internal changes
14
+
15
+ - chore: [JENKINS] Refactor automated testing [valentinab25 - [`8438e52`](https://github.com/eea/volto-datahub/commit/8438e52e811c46aa542a601b75f4198b214b5ffd)]
16
+ - chore: husky, lint-staged use fixed versions [valentinab25 - [`da129fb`](https://github.com/eea/volto-datahub/commit/da129fb1259a26c87259f380a37db688281b192d)]
17
+
18
+ #### :hammer_and_wrench: Others
19
+
20
+ - Remove noreferrer for SEO purposes #60 from eea/263008-noreferrer [ichim-david - [`3c68343`](https://github.com/eea/volto-datahub/commit/3c6834393f25bb3e1ffc119512e785db5dca0e7d)]
21
+ - update snapshots [Teodor - [`7a3471b`](https://github.com/eea/volto-datahub/commit/7a3471bcc125ce66b5bd6933b7b9161320c14a23)]
22
+ - remove eslint file from ignoring [Teodor - [`39f6633`](https://github.com/eea/volto-datahub/commit/39f66338f2f7d1797343b88aa20dea9425f37014)]
23
+ - change eslint rule [Teodor - [`73e4bc2`](https://github.com/eea/volto-datahub/commit/73e4bc217e9aa9804f0f57cf9e3488cb2e1e85b8)]
24
+ - Ref #263008 [Teodor - [`9d58c52`](https://github.com/eea/volto-datahub/commit/9d58c52b6bc207c5c622c0428be39ae18875cf64)]
25
+ - test: [JENKINS] Use java17 for sonarqube scanner [valentinab25 - [`524fcc6`](https://github.com/eea/volto-datahub/commit/524fcc6a40e1437dac449543607089b4ba4feb21)]
26
+ - test: [JENKINS] Run cypress in started frontend container [valentinab25 - [`98c01ac`](https://github.com/eea/volto-datahub/commit/98c01ac599087cf5a9011d3384483d023a4d12bb)]
27
+ - test: [JENKINS] Add cpu limit on cypress docker [valentinab25 - [`bdcc59c`](https://github.com/eea/volto-datahub/commit/bdcc59c2d4cfd8beba4386d6f23f220c777f0513)]
28
+ - test: [JENKINS] Increase shm-size to cypress docker [valentinab25 - [`5d12d14`](https://github.com/eea/volto-datahub/commit/5d12d1428a547b8628231dc38110a55b806edebb)]
29
+ - test: [JENKINS] Improve cypress time [valentinab25 - [`dba984e`](https://github.com/eea/volto-datahub/commit/dba984e6b840c451b8de15d40de0e49c1dd09a9b)]
30
+ ### [1.0.32](https://github.com/eea/volto-datahub/compare/1.0.31...1.0.32) - 11 October 2023
31
+
32
+ #### :house: Internal changes
33
+
34
+ - chore:volto 16 in tests, update docs, fix stylelint overrides [valentinab25 - [`5ae8426`](https://github.com/eea/volto-datahub/commit/5ae8426dc5cb4786aa1fb52b0b4e416ba47dcacf)]
35
+
36
+ #### :hammer_and_wrench: Others
37
+
38
+ - Fix hostname generation for RSS links [Tiberiu Ichim - [`7fc7896`](https://github.com/eea/volto-datahub/commit/7fc78961917f91cdefa022d0938a2f0fe410377a)]
39
+ - Fix hostname generation for RSS links [Tiberiu Ichim - [`5fc2df3`](https://github.com/eea/volto-datahub/commit/5fc2df3e1871575bb8453959973a3fc9d8297664)]
7
40
  ### [1.0.31](https://github.com/eea/volto-datahub/compare/1.0.30...1.0.31) - 29 September 2023
8
41
 
9
42
  #### :house: Documentation changes
package/RELEASE.md CHANGED
@@ -20,9 +20,9 @@ You need to first install the [release-it](https://github.com/release-it/release
20
20
  ```
21
21
  npm install -g release-it
22
22
  ```
23
-
23
+
24
24
  Release-it uses the configuration written in the [`.release-it.json`](./.release-it.json) file located in the root of the repository.
25
-
25
+
26
26
  Release-it is a tool that automates 4 important steps in the release process:
27
27
 
28
28
  1. Version increase in `package.json` ( increased from the current version in `package.json`)
@@ -30,45 +30,45 @@ Release-it is a tool that automates 4 important steps in the release process:
30
30
  3. GitHub release on the commit with the changelog and package.json modification on the develop branch
31
31
  4. NPM release ( by default it's disabled, but can be enabled in the configuration file )
32
32
 
33
- To configure the authentification, you need to export GITHUB_TOKEN for [GitHub](https://github.com/settings/tokens)
33
+ To configure the authentification, you need to export GITHUB_TOKEN for [GitHub](https://github.com/settings/tokens)
34
34
 
35
35
  ```
36
36
  export GITHUB_TOKEN=XXX-XXXXXXXXXXXXXXXXXXXXXX
37
37
  ```
38
-
38
+
39
39
  To configure npm, you can use the `npm login` command or use a configuration file with a TOKEN :
40
-
40
+
41
41
  ```
42
42
  echo "//registry.npmjs.org/:_authToken=YYYYYYYYYYYYYYYYYYYYYYYYYYYYYY" > .npmrc
43
43
  ```
44
44
 
45
45
  #### Using release-it tool
46
-
46
+
47
47
  There are 3 yarn scripts that can be run to do the release
48
48
 
49
49
  ##### yarn release-beta
50
50
 
51
- Automatically calculates and presents 3 beta versions - patch, minor and major for you to choose ( or Other for manual input).
51
+ Automatically calculates and presents 3 beta versions - patch, minor and major for you to choose ( or Other for manual input).
52
52
 
53
53
  ```
54
- ? Select increment (next version):
55
- ❯ prepatch (0.1.1-beta.0)
56
- preminor (0.2.0-beta.0)
57
- premajor (1.0.0-beta.0)
58
- Other, please specify...
54
+ ? Select increment (next version):
55
+ ❯ prepatch (0.1.1-beta.0)
56
+ preminor (0.2.0-beta.0)
57
+ premajor (1.0.0-beta.0)
58
+ Other, please specify...
59
59
  ```
60
60
 
61
61
  ##### yarn release-major-beta
62
62
 
63
63
  Same as `yarn release-beta`, but with premajor version pre-selected.
64
-
64
+
65
65
  ##### yarn release
66
66
 
67
67
  Generic command, does not automatically add the `beta` to version, but you can still manually write it if you choose Other.
68
68
 
69
69
  #### Important notes
70
70
 
71
- > Do not use release-it tool on master branch, the commit on CHANGELOG.md file and the version increase in the package.json file can't be done without a PULL REQUEST.
71
+ > Do not use release-it tool on master branch, the commit on CHANGELOG.md file and the version increase in the package.json file can't be done without a PULL REQUEST.
72
72
 
73
73
  > Do not keep Pull Requests from develop to master branches open when you are doing beta releases from the develop branch. As long as a PR to master is open, an automatic script will run on every commit and will update both the version and the changelog to a production-ready state - ( MAJOR.MINOR.PATCH mandatory format for version).
74
74
 
package/cypress.config.js CHANGED
@@ -2,12 +2,12 @@ const { defineConfig } = require('cypress');
2
2
 
3
3
  module.exports = defineConfig({
4
4
  viewportWidth: 1280,
5
- defaultCommandTimeout: 5000,
5
+ defaultCommandTimeout: 8888,
6
6
  chromeWebSecurity: false,
7
7
  reporter: 'junit',
8
- video: true,
8
+ video: false,
9
9
  retries: {
10
- runMode: 1,
10
+ runMode: 2,
11
11
  openMode: 0,
12
12
  },
13
13
  reporterOptions: {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@eeacms/volto-datahub",
3
- "version": "1.0.31",
3
+ "version": "1.0.33",
4
4
  "description": "@eeacms/volto-datahub: Volto add-on",
5
5
  "main": "src/index.js",
6
6
  "author": "European Environment Agency: IDM2 A-Team",
@@ -26,8 +26,8 @@
26
26
  "@cypress/code-coverage": "^3.10.0",
27
27
  "@plone/scripts": "*",
28
28
  "babel-plugin-transform-class-properties": "^6.24.1",
29
- "husky": "*",
30
- "lint-staged": "*",
29
+ "husky": "^8.0.3",
30
+ "lint-staged": "^14.0.1",
31
31
  "md5": "^2.3.0"
32
32
  },
33
33
  "addons": [
@@ -10,12 +10,7 @@ const ItemLink = ({ item }) => (
10
10
  <List.Content>
11
11
  <div className="dataset-item">
12
12
  <SVGIcon name={servicesSVG} size="20px" />
13
- <a
14
- className="item-link"
15
- href={item.url}
16
- target="_blank"
17
- rel="noreferrer"
18
- >
13
+ <a className="item-link" href={item.url} target="_blank">
19
14
  {item.protocol} {item.name || item.description}
20
15
  </a>
21
16
  {isInternalURL(item.url) ? (
@@ -15,12 +15,7 @@ export default function DatasetHttpLinks({ dataset }) {
15
15
  <List.Content>
16
16
  <div className="dataset-item">
17
17
  <Icon className="linkify" />
18
- <a
19
- href={item.url}
20
- className="item-link"
21
- target="_blank"
22
- rel="noreferrer"
23
- >
18
+ <a href={item.url} className="item-link" target="_blank">
24
19
  <span>{item.name || item.url}</span>
25
20
  </a>
26
21
  {isInternalURL(item.url) ? (
@@ -40,12 +35,7 @@ export default function DatasetHttpLinks({ dataset }) {
40
35
  <List.Content>
41
36
  <div className="dataset-item">
42
37
  <Icon className="info circle" />
43
- <a
44
- href={item.url}
45
- className="item-link"
46
- target="_blank"
47
- rel="noreferrer"
48
- >
38
+ <a href={item.url} className="item-link" target="_blank">
49
39
  <span>{item.name || item.url}</span>
50
40
  </a>
51
41
  {isInternalURL(item.url) ? (
@@ -80,7 +80,6 @@ const MetadataSection = (props) => {
80
80
  <Icon className="file pdf" />
81
81
  <a
82
82
  target="_blank"
83
- rel="noreferrer"
84
83
  href={
85
84
  `${appConfig.indexBaseUrl}/catalogue/datahub/api/records/` +
86
85
  `${docid}/formatters/xsl-view?output=pdf&language=eng&approved=true`
@@ -94,7 +93,6 @@ const MetadataSection = (props) => {
94
93
  <Icon className="ri-external-link-line" />
95
94
  <a
96
95
  target="_blank"
97
- rel="noreferrer"
98
96
  href={`${appConfig.indexBaseUrl}/catalogue/srv/eng/catalog.search#/metadata/${docid}`}
99
97
  >
100
98
  Metadata catalogue
@@ -1,14 +1,9 @@
1
1
  import { ResultModel } from '@eeacms/search';
2
- const path = require('path');
3
2
 
4
3
  export class DatahubResultModel extends ResultModel {
5
4
  get href() {
6
5
  if (__CLIENT__) {
7
- return path.join(
8
- window.location.pathname,
9
- 'datahubitem-view/',
10
- this._result.about?.raw,
11
- );
6
+ return `${window.location.pathname}/datahubitem-view/${this._result.about?.raw}`;
12
7
  } else {
13
8
  return ''; //TODO
14
9
  }
@@ -12,6 +12,8 @@ import {
12
12
  redirectRouteId,
13
13
  } from '@eeacms/volto-datahub/constants';
14
14
 
15
+ const EEA_DATAHUB = `https://eea.europa.eu/en/datahub`;
16
+
15
17
  const getUrlES = (appName) => {
16
18
  return (
17
19
  process.env[`RAZZLE_PROXY_ES_DSN_${appName}`] ||
@@ -43,7 +45,7 @@ function handleSearchRequest(body, params) {
43
45
 
44
46
  function generateSitemap(appConfig) {
45
47
  const toPublicURL = (id) => {
46
- return `https://eea.europa.eu/en/datahub/${viewRouteId}/${id}`;
48
+ return `${EEA_DATAHUB}/${viewRouteId}/${id}`;
47
49
  };
48
50
 
49
51
  return new Promise((resolve, reject) => {
@@ -134,9 +136,9 @@ function generateRSS({ appConfig, feedUrl, toPublicURL }) {
134
136
  const feed = new Feed({
135
137
  title: 'EEA Datahub',
136
138
  description: 'Latest changes in EEA Datahub',
137
- id: 'https://eea.europa.eu/en/datahub',
139
+ id: EEA_DATAHUB,
138
140
  generator: 'EEA Website',
139
- link: 'https://eea.europa.eu/en/datahub',
141
+ link: EEA_DATAHUB,
140
142
  feedLinks: {
141
143
  rss: feedUrl,
142
144
  },
@@ -199,10 +201,9 @@ function generateItemRSS({ appConfig, feedUrl, toPublicURL, params }) {
199
201
  function make_rssMiddleware(config, generator) {
200
202
  function rssMiddleware(req, res, next) {
201
203
  const appConfig = registry.searchui['datahub'];
202
- const feedUrl = `${config.settings.apiPath}${req.path}`;
204
+ const feedUrl = `${EEA_DATAHUB}${req.path}`;
203
205
 
204
- const toPublicURL = (id) =>
205
- `${config.settings.apiPath}/en/datahub/${viewRouteId}/${id}`;
206
+ const toPublicURL = (id) => `${EEA_DATAHUB}/${viewRouteId}/${id}`;
206
207
 
207
208
  generator({ appConfig, feedUrl, toPublicURL, params: req.params })
208
209
  .then((body) => {