Merge pull request #89 from eea/develop

Release
eea · Oct 12, 2023 · c447165 · c447165
2 parents 2468d8b + cbe3e02
commit c447165
Show file tree

Hide file tree

Showing 10 changed files with 145 additions and 102 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/.husky/pre-commit b/.husky/pre-commit
@@ -0,0 +1,2 @@
+[ -n "$CI" ] && exit 0
+yarn lint-staged
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,22 @@ 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).
 
+### [7.0.5](https://github.com/eea/volto-plotlycharts/compare/7.0.4...7.0.5) - 10 October 2023
+
+#### :house: Internal changes
+
+- chore:volto 16 in tests, update docs, fix stylelint overrides [valentinab25 - [`3b9c3ef`](https://github.com/eea/volto-plotlycharts/commit/3b9c3ef8626b0155034e02f8249380cdebaf2258)]
+- chore: change volto version in Jenkinsfile [ana-oprea - [`7397ad5`](https://github.com/eea/volto-plotlycharts/commit/7397ad5ca8f1956d75526778bcc7846f4ff1ce2d)]
+- style: lint-staged reorder in package.json [Alin Voinea - [`086508a`](https://github.com/eea/volto-plotlycharts/commit/086508af1e2f9cb0a2c5547ca5a27acde92024e4)]
+
+#### :house: Documentation changes
+
+- docs: Update README and DEVELOP [Alin Voinea - [`f84905b`](https://github.com/eea/volto-plotlycharts/commit/f84905b0d7152f84f1cd1e1738f0ef5ae80df545)]
+- docs: Update README and DEVELOP [Alin Voinea - [`3e4b1ff`](https://github.com/eea/volto-plotlycharts/commit/3e4b1ffbc7d4947afe529850d7e9cda8b8f22d47)]
+
+#### :hammer_and_wrench: Others
+
+- test: EN locales, pre-commit fix, feature PRs checks Refs #257193 [valentinab25 - [`93857b8`](https://github.com/eea/volto-plotlycharts/commit/93857b82278a5435c4afb507ce269b74ea83e101)]
 ### [7.0.4](https://github.com/eea/volto-plotlycharts/compare/7.0.3...7.0.4) - 5 September 2023
 
 #### :house: Internal changes
@@ -96,17 +112,13 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 #### :house: Internal changes
 
-- chore: [JENKINS] Deprecate circularity website [valentinab25 - [`5ba637d`](https://github.com/eea/volto-plotlycharts/commit/5ba637d9bc67eaf2d17b0187b7022b0286def12c)]
 
 ### [6.1.0](https://github.com/eea/volto-plotlycharts/compare/6.0.4...6.1.0) - 29 May 2023
 
 #### :hammer_and_wrench: Others
 
 - bump version [Miu Razvan - [`0ddeb5a`](https://github.com/eea/volto-plotlycharts/commit/0ddeb5a344ece4c8258f74e5b2cb961a7970b2d1)]
 - eslint fix [Miu Razvan - [`5993d2a`](https://github.com/eea/volto-plotlycharts/commit/5993d2a3db4cc1f1a050df1878c19d62003d7389)]
-- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`893ec45`](https://github.com/eea/volto-plotlycharts/commit/893ec45ef24f8af317070a1ca6919c82cfc67a14)]
-- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`56557c2`](https://github.com/eea/volto-plotlycharts/commit/56557c20f0be11bac73679e7e84adeb8f208d564)]
-- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`f830d03`](https://github.com/eea/volto-plotlycharts/commit/f830d039ec730b6d607203250db4527407309941)]
 ### [6.0.4](https://github.com/eea/volto-plotlycharts/compare/6.0.3...6.0.4) - 22 May 2023
 
 ### [6.0.3](https://github.com/eea/volto-plotlycharts/compare/6.0.2...6.0.3) - 11 May 2023
@@ -229,7 +241,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 #### :hammer_and_wrench: Others
 
 - update(jest): add @plone/volto-slate resolver refs- #153447 [nileshgulia1 - [`ba5eda5`](https://github.com/eea/volto-plotlycharts/commit/ba5eda5e81dc494358e90f071b0c20c1896b48b7)]
-- Add Sonarqube tag using circularity-frontend addons list [EEA Jenkins - [`68acebc`](https://github.com/eea/volto-plotlycharts/commit/68acebca55be4cfbbc158646069ee03112c432cb)]
 - Use volto 16.0.0-alpha.14 for cypress tests [Miu Razvan - [`0c9a2c5`](https://github.com/eea/volto-plotlycharts/commit/0c9a2c56964387a89332caaeee8d4f68f1c119bb)]
 ### [3.0.6](https://github.com/eea/volto-plotlycharts/compare/3.0.5...3.0.6) - 15 July 2022
 
@@ -287,7 +298,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - Better catches for plotly data [Andrei Grigore - [`597e6af`](https://github.com/eea/volto-plotlycharts/commit/597e6af6045789bb2a653933c373a369965f354a)]
 - Lint fix [Andrei Grigore - [`3c3f741`](https://github.com/eea/volto-plotlycharts/commit/3c3f741a5225188747fbf51ed2d4031560372e91)]
 - Set individual colors for barcharts also (WIP) [Andrei Grigore - [`c0ea139`](https://github.com/eea/volto-plotlycharts/commit/c0ea13919c998237d46dcbf1b456a10876f5df54)]
-- Add Sonarqube tag using freshwater-frontend addons list [EEA Jenkins - [`8ebc425`](https://github.com/eea/volto-plotlycharts/commit/8ebc425a017ccb97e3783f73c5a13f19c6e11aaa)]
 - Refs #142010 - Optimize Volto-addons gitflow pipelines [valentinab25 - [`349d395`](https://github.com/eea/volto-plotlycharts/commit/349d3958dbebcf17056a4b28cc3a14905ed672b4)]
 ### [2.0.10](https://github.com/eea/volto-plotlycharts/compare/2.0.9...2.0.10) - 16 November 2021
 
@@ -359,9 +369,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - Show info note with old editor on old editor data sources [Andrei Grigore - [`d60f16f`](https://github.com/eea/volto-plotlycharts/commit/d60f16f1d9d30bcaf9cf804513a55d8288bb31a0)]
 - Check for old editor data [Andrei Grigore - [`99074a1`](https://github.com/eea/volto-plotlycharts/commit/99074a1231224c697cca8f3f4df739a2ea61bff4)]
 - Switch Chart Text editor with SlateEditor [Andrei Grigore - [`33c59d7`](https://github.com/eea/volto-plotlycharts/commit/33c59d78bd1e123c39faf44e1395d978e9d68aa3)]
-- Add Sonarqube tag using frontend addons list [EEA Jenkins - [`d10f4a4`](https://github.com/eea/volto-plotlycharts/commit/d10f4a4eab154c9ffaae7be80d7a6ee23a4afc7c)]
-- Add Sonarqube tag using frontend addons list [EEA Jenkins - [`8d36a0a`](https://github.com/eea/volto-plotlycharts/commit/8d36a0a372a924960caf83609e4eaa3bede9a2b1)]
-- Add Sonarqube tag using frontend addons list [EEA Jenkins - [`1519427`](https://github.com/eea/volto-plotlycharts/commit/151942741b1683d572a096930a6a07323ab31b22)]
 ### [2.0.5](https://github.com/eea/volto-plotlycharts/compare/2.0.4...2.0.5) - 30 June 2021
 
 #### :hammer_and_wrench: Others

diff --git a/DEVELOP.md b/DEVELOP.md
@@ -16,62 +16,60 @@
 
 1. Go to http://localhost:3000
 
-1.  Happy hacking!
+1. Initialize git hooks
 
     ```Bash
-    cd src/addons/volto-plotlycharts/
+    yarn prepare
     ```
 
+1. Happy hacking!
+
 ### Or add @eeacms/volto-plotlycharts to your Volto project
 
 Before starting make sure your development environment is properly set. See [Volto Developer Documentation](https://docs.voltocms.com/getting-started/install/)
 
 1.  Make sure you have installed `yo`, `@plone/generator-volto` and `mrs-developer`
 
-        $ npm install -g yo
-        $ npm install -g @plone/generator-volto
-        $ npm install -g mrs-developer
+        npm install -g yo @plone/generator-volto mrs-developer
 
 1.  Create new volto app
 
-        $ yo @plone/volto my-volto-project --addon volto-plotlycharts --workspace src/addons/volto-plotlycharts
-        $ cd my-volto-project
+        yo @plone/volto my-volto-project --addon @eeacms/volto-plotlycharts --skip-install
+        cd my-volto-project
 
 1.  Add the following to `mrs.developer.json`:
 
         {
             "volto-plotlycharts": {
                 "url": "https://github.com/eea/volto-plotlycharts.git",
-                "package": "volto-plotlycharts",
+                "package": "@eeacms/volto-plotlycharts",
                 "branch": "develop",
                 "path": "src"
             }
         }
 
 1.  Install
 
-        $ yarn develop
-        $ yarn
+        make develop
+        yarn
 
 1.  Start backend
 
-        $ docker run -d --name plone -p 8080:8080 -e SITE=Plone plone
+        docker run --pull always -it --rm --name plone -p 8080:8080 -e SITE=Plone plone/plone-backend
 
     ...wait for backend to setup and start - `Ready to handle requests`:
 
-        $ docker logs -f plone
-
     ...you can also check http://localhost:8080/Plone
 
 1.  Start frontend
 
-        $ yarn start
+        yarn start
 
 1.  Go to http://localhost:3000
 
 1.  Happy hacking!
 
-        $ cd src/addons/volto-plotlycharts/
+        cd src/addons/volto-plotlycharts/
 
 ## Cypress
 

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -6,7 +6,7 @@ pipeline {
         NAMESPACE = "@eeacms"
         SONARQUBE_TAGS = "volto.eea.europa.eu,climate-energy.eea.europa.eu,forest.eea.europa.eu,biodiversity.europa.eu,water.europa.eu-freshwater,demo-www.eea.europa.eu,www.eea.europa.eu-en"
         DEPENDENCIES = "@eeacms/volto-datablocks"
-        VOLTO = ""
+        VOLTO = "16"
     }
 
   stages {
@@ -62,11 +62,17 @@ pipeline {
 
     stage('Tests') {
       when {
-        allOf {
-          environment name: 'CHANGE_ID', value: ''
-          anyOf {
-           not { changelog '.*^Automated release [0-9\\.]+$' }
-           branch 'master'
+        anyOf {
+          allOf {
+            not { environment name: 'CHANGE_ID', value: '' }
+            environment name: 'CHANGE_TARGET', value: 'develop'
+          }
+          allOf {
+            environment name: 'CHANGE_ID', value: ''
+            anyOf {
+              not { changelog '.*^Automated release [0-9\\.]+$' }
+              branch 'master'
+            }
           }
         }
       }
@@ -110,11 +116,17 @@ pipeline {
 
     stage('Integration tests') {
       when {
-        allOf {
-          environment name: 'CHANGE_ID', value: ''
-          anyOf {
-           not { changelog '.*^Automated release [0-9\\.]+$' }
-           branch 'master'
+        anyOf {
+          allOf {
+            not { environment name: 'CHANGE_ID', value: '' }
+            environment name: 'CHANGE_TARGET', value: 'develop'
+          }
+          allOf {
+            environment name: 'CHANGE_ID', value: ''
+            anyOf {
+              not { changelog '.*^Automated release [0-9\\.]+$' }
+              branch 'master'
+            }
           }
         }
       }
@@ -167,13 +179,19 @@ pipeline {
 
     stage('Report to SonarQube') {
       when {
-        allOf {
-          environment name: 'CHANGE_ID', value: ''
-          anyOf {
-            branch 'master'
-            allOf {
-              branch 'develop'
-              not { changelog '.*^Automated release [0-9\\.]+$' }
+        anyOf {
+          allOf {
+            not { environment name: 'CHANGE_ID', value: '' }
+            environment name: 'CHANGE_TARGET', value: 'develop'
+          }
+          allOf {
+            environment name: 'CHANGE_ID', value: ''
+            anyOf {
+              allOf {
+                branch 'develop'
+                not { changelog '.*^Automated release [0-9\\.]+$' }
+              }
+              branch 'master'
             }
           }
         }
@@ -199,10 +217,16 @@ pipeline {
 
     stage('SonarQube compare to master') {
       when {
-        allOf {
-          environment name: 'CHANGE_ID', value: ''
-          branch 'develop'
-          not { changelog '.*^Automated release [0-9\\.]+$' }
+        anyOf {
+          allOf {
+            not { environment name: 'CHANGE_ID', value: '' }
+            environment name: 'CHANGE_TARGET', value: 'develop'
+          }
+          allOf {
+            environment name: 'CHANGE_ID', value: ''
+            branch 'develop'
+            not { changelog '.*^Automated release [0-9\\.]+$' }
+          }
         }
       }
       steps {

diff --git a/Makefile b/Makefile
@@ -97,12 +97,12 @@ stylelint:		## Stylelint
 
 .PHONY: stylelint-overrides
 stylelint-overrides:
-	$(NODE_MODULES)/.bin/stylelint --syntax less --allow-empty-input 'theme/**/*.overrides' 'src/**/*.overrides'
+	$(NODE_MODULES)/.bin/stylelint --custom-syntax less --allow-empty-input 'theme/**/*.overrides' 'src/**/*.overrides'
 
 .PHONY: stylelint-fix
 stylelint-fix:	## Fix stylelint
 	$(NODE_MODULES)/stylelint/bin/stylelint.js --allow-empty-input 'src/**/*.{css,less}' --fix
-	$(NODE_MODULES)/.bin/stylelint --syntax less --allow-empty-input 'theme/**/*.overrides' 'src/**/*.overrides' --fix
+	$(NODE_MODULES)/.bin/stylelint --custom-syntax less --allow-empty-input 'theme/**/*.overrides' 'src/**/*.overrides' --fix
 
 .PHONY: prettier
 prettier:		## Prettier

diff --git a/README.md b/README.md
@@ -27,30 +27,20 @@ Plotly Charts and Plotly Chart Editor integration with Volto
 
 ![Plotlycharts](https://raw.githubusercontent.com/eea/volto-plotlycharts/master/docs/volto-plotlycharts.gif)
 
-## Getting started
-
-### Try volto-plotlycharts with Docker
-
-1. Get the latest Docker images
-
-   ```
-   docker pull plone
-   docker pull plone/volto
-   ```
+## Upgrade
 
-1. Start Plone backend
+* Version `^6.0.0` requires `^[email protected]`
 
-   ```
-   docker run -d --name plone -p 8080:8080 -e SITE=Plone -e PROFILES="profile-plone.restapi:blocks" plone
-   ```
+## Getting started
 
-1. Start Volto frontend
+### Try volto-plotlycharts with Docker
 
-   ```
-   docker run -it --rm -p 3000:3000 --link plone -e ADDONS="@eeacms/volto-plotlycharts" plone/volto
-   ```
+      git clone https://github.com/eea/volto-plotlycharts.git
+      cd volto-plotlycharts
+      make
+      make start
 
-1. Go to http://localhost:3000
+Go to http://localhost:3000
 
 ### Add volto-plotlycharts to your Volto project
 
@@ -62,25 +52,25 @@ Plotly Charts and Plotly Chart Editor integration with Volto
 
 1. Start Volto frontend
 
-- If you already have a volto project, just update `package.json`:
+* If you already have a volto project, just update `package.json`:
 
-  ```JSON
-  "addons": [
-      "@eeacms/volto-plotlycharts"
-  ],
+   ```JSON
+   "addons": [
+       "@eeacms/volto-plotlycharts"
+   ],
 
-  "dependencies": {
-      "@eeacms/volto-plotlycharts": "^1.0.0"
-  }
-  ```
+   "dependencies": {
+       "@eeacms/volto-plotlycharts": "*"
+   }
+   ```
 
-- If not, create one:
+* If not, create one:
 
-  ```
-  npm install -g yo @plone/generator-volto
-  yo @plone/volto my-volto-project --addon @eeacms/volto-plotlycharts
-  cd my-volto-project
-  ```
+   ```
+   npm install -g yo @plone/generator-volto
+   yo @plone/volto my-volto-project --canary --addon @eeacms/volto-plotlycharts
+   cd my-volto-project
+   ```
 
 1. Install new add-ons and restart Volto:
 
@@ -95,8 +85,6 @@ Plotly Charts and Plotly Chart Editor integration with Volto
 
 ## Release
 
-Version ^6.0.0 requires ^[email protected]
-
 See [RELEASE.md](https://github.com/eea/volto-plotlycharts/blob/master/RELEASE.md).
 
 ## How to contribute