@eeacms/volto-clms-theme 1.1.29 → 1.1.31

package/CHANGELOG.md

@@ -4,6 +4,26 @@ 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.1.31](https://github.com/eea/volto-clms-theme/compare/1.1.30...1.1.31) - 3 August 2023
+
+#### :hammer_and_wrench: Others
+
+- fix historic download [ionlizarazu - [`8676d52`](https://github.com/eea/volto-clms-theme/commit/8676d52151bc5843c57552953e5927a49804db29)]
+- add HistoricHOC to all downloads view [ionlizarazu - [`f1634fb`](https://github.com/eea/volto-clms-theme/commit/f1634fbeec45fd3c1b1c9dd391cd5784f78d5636)]
+### [1.1.30](https://github.com/eea/volto-clms-theme/compare/1.1.29...1.1.30) - 3 August 2023
+
+#### :house: Documentation changes
+
+- docs: Cleanup Makefile, update DEVELOP documentation, i18n - refs #254894 [valentinab25 - [`4ad3273`](https://github.com/eea/volto-clms-theme/commit/4ad32731b97cd60e4183715c445e4c6a7e2d07ad)]
+
+#### :hammer_and_wrench: Others
+
+- remove CLMSHistoricDownloadView and reuse CLMSDownloadView for the render [ionlizarazu - [`a366c4d`](https://github.com/eea/volto-clms-theme/commit/a366c4d85ea3c92ea041ff2ad8e6095a9ce5be4b)]
+- comment some cypress related Jenkinsfile tests [ionlizarazu - [`82a48f3`](https://github.com/eea/volto-clms-theme/commit/82a48f34040c72cb71fb1204edab7bb920ae1d18)]
+- uncomment Integration tests at Jenkinsfile [ionlizarazu - [`281ce68`](https://github.com/eea/volto-clms-theme/commit/281ce6821223b1e9a4ba4f0c07cc72d593d03403)]
+- add sonarcube reporting to Jenkinsfile [ionlizarazu - [`4411c40`](https://github.com/eea/volto-clms-theme/commit/4411c40c648d0783e5c302c2f1c5a4f2f5a79f6f)]
+- sonarcube tests [ionlizarazu - [`23c76d4`](https://github.com/eea/volto-clms-theme/commit/23c76d48c0c3006952496edb829191294439ce87)]
+- move FAQ to the 4th position in the Search Block filters [ionlizarazu - [`9a6f4a9`](https://github.com/eea/volto-clms-theme/commit/9a6f4a963dac5bdc37c98e2d318584758c00bbee)]
 ### [1.1.29](https://github.com/eea/volto-clms-theme/compare/1.1.28...1.1.29) - 18 July 2023
 
 #### :hammer_and_wrench: Others

package/DEVELOP.md

@@ -2,6 +2,28 @@
 
 ## Develop
 
+1. Make sure you have `docker` and `docker compose` installed and running on your machine:
+
+    ```Bash
+    git clone https://github.com/eea/volto-clms-theme.git
+    cd volto-clms-theme
+    git checkout -b bugfix-123456 develop
+    make
+    make start
+    ```
+
+1. Wait for `Volto started at 0.0.0.0:3000` meesage
+
+1. Go to http://localhost:3000
+
+1.  Happy hacking!
+
+    ```Bash
+    cd src/addons/volto-clms-theme/
+    ```
+
+### Or add @eeacms/volto-clms-theme 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`
@@ -50,3 +72,37 @@ Before starting make sure your development environment is properly set. See [Vol
 
         $ cd src/addons/volto-clms-theme/
 
+
+## Cypress
+
+To run cypress locally, first make sure you don't have any Volto/Plone running on ports `8080` and `3000`.
+
+You don't have to be in a `clean-volto-project`, you can be in any Volto Frontend
+project where you added `volto-clms-theme` to `mrs.developer.json`
+
+Go to:
+
+  ```BASH
+  cd src/addons/volto-clms-theme/
+  ```
+
+Start:
+
+  ```Bash
+  make
+  make start
+  ```
+
+This will build and start with Docker a clean `Plone backend` and `Volto Frontend` with `volto-clms-theme` block installed.
+
+Open Cypress Interface:
+
+  ```Bash
+  make cypress-open
+  ```
+
+Or run it:
+
+  ```Bash
+  make cypress-run
+  ```

package/Dockerfile

@@ -0,0 +1,14 @@
+# syntax=docker/dockerfile:1
+ARG VOLTO_VERSION
+FROM plone/frontend-builder:${VOLTO_VERSION}
+
+ARG ADDON_NAME
+ARG ADDON_PATH
+
+COPY --chown=node:node ./ /app/src/addons/${ADDON_PATH}/
+
+RUN /setupAddon
+RUN yarn install
+
+ENTRYPOINT ["yarn"]
+CMD ["start"]

package/Jenkinsfile

@@ -165,37 +165,63 @@ pipeline {
     //   }
     // }
 
-    // stage('Report to SonarQube') {
-    //   when {
-    //     allOf {
-    //       environment name: 'CHANGE_ID', value: ''
-    //       anyOf {
-    //         branch 'master'
-    //         allOf {
-    //           branch 'develop'
-    //           not { changelog '.*^Automated release [0-9\\.]+$' }
-    //         }
-    //       }
-    //     }
-    //   }
-    //   steps {
-    //     node(label: 'swarm') {
-    //       script{
-    //         checkout scm
-    //         unstash "xunit-reports"
-    //         unstash "cypress-coverage"
-    //         def scannerHome = tool 'SonarQubeScanner';
-    //         def nodeJS = tool 'NodeJS';
-    //         withSonarQubeEnv('Sonarqube') {
-    //           sh '''sed -i "s#/opt/frontend/my-volto-project/src/addons/${GIT_NAME}/##g" xunit-reports/coverage/lcov.info'''
-    //           sh '''sed -i "s#src/addons/${GIT_NAME}/##g" xunit-reports/coverage/lcov.info'''
-    //           sh "export PATH=${scannerHome}/bin:${nodeJS}/bin:$PATH; sonar-scanner -Dsonar.javascript.lcov.reportPaths=./xunit-reports/coverage/lcov.info,./cypress-coverage/coverage/lcov.info -Dsonar.sources=./src -Dsonar.projectKey=$GIT_NAME-$BRANCH_NAME -Dsonar.projectVersion=$BRANCH_NAME-$BUILD_NUMBER"
-    //           sh '''try=2; while [ \$try -gt 0 ]; do curl -s -XPOST -u "${SONAR_AUTH_TOKEN}:" "${SONAR_HOST_URL}api/project_tags/set?project=${GIT_NAME}-${BRANCH_NAME}&tags=${SONARQUBE_TAGS},${BRANCH_NAME}" > set_tags_result; if [ \$(grep -ic error set_tags_result ) -eq 0 ]; then try=0; else cat set_tags_result; echo "... Will retry"; sleep 60; try=\$(( \$try - 1 )); fi; done'''
-    //         }
-    //       }
-    //     }
-    //   }
-    // }
+    stage('Report to SonarQube') {
+      when {
+        allOf {
+          environment name: 'CHANGE_ID', value: ''
+          anyOf {
+            branch 'master'
+            allOf {
+              branch 'develop'
+              not { changelog '.*^Automated release [0-9\\.]+$' }
+            }
+          }
+        }
+      }
+      steps {
+        node(label: 'swarm') {
+          script{
+            checkout scm
+            unstash "xunit-reports"
+            // unstash "cypress-coverage"
+            def scannerHome = tool 'SonarQubeScanner';
+            def nodeJS = tool 'NodeJS';
+            withSonarQubeEnv('Sonarqube') {
+              sh '''sed -i "s#/opt/frontend/my-volto-project/src/addons/${GIT_NAME}/##g" xunit-reports/coverage/lcov.info'''
+              sh '''sed -i "s#src/addons/${GIT_NAME}/##g" xunit-reports/coverage/lcov.info'''
+              // sh "export PATH=${scannerHome}/bin:${nodeJS}/bin:$PATH; sonar-scanner -Dsonar.javascript.lcov.reportPaths=./xunit-reports/coverage/lcov.info,./cypress-coverage/coverage/lcov.info -Dsonar.sources=./src -Dsonar.projectKey=$GIT_NAME-$BRANCH_NAME -Dsonar.projectVersion=$BRANCH_NAME-$BUILD_NUMBER"
+              sh "export PATH=${scannerHome}/bin:${nodeJS}/bin:$PATH; sonar-scanner -Dsonar.javascript.lcov.reportPaths=./xunit-reports/coverage/lcov.info -Dsonar.sources=./src -Dsonar.projectKey=$GIT_NAME-$BRANCH_NAME -Dsonar.projectVersion=$BRANCH_NAME-$BUILD_NUMBER"
+              sh '''try=2; while [ \$try -gt 0 ]; do curl -s -XPOST -u "${SONAR_AUTH_TOKEN}:" "${SONAR_HOST_URL}api/project_tags/set?project=${GIT_NAME}-${BRANCH_NAME}&tags=${SONARQUBE_TAGS},${BRANCH_NAME}" > set_tags_result; if [ \$(grep -ic error set_tags_result ) -eq 0 ]; then try=0; else cat set_tags_result; echo "... Will retry"; sleep 60; try=\$(( \$try - 1 )); fi; done'''
+            }
+          }
+        }
+      }
+    }
+
+    stage('SonarQube compare to master') {
+      when {
+        allOf {
+          environment name: 'CHANGE_ID', value: ''
+          branch 'develop'
+          not { changelog '.*^Automated release [0-9\\.]+$' }
+        }
+      }
+      steps {
+        node(label: 'docker') {
+          script {
+            sh '''docker pull eeacms/gitflow'''
+            sh '''echo "Error" > checkresult.txt'''
+            catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
+               sh '''set -o pipefail; docker run -i --rm --name="$BUILD_TAG-gitflow-sn" -e GIT_BRANCH="$BRANCH_NAME" -e GIT_NAME="$GIT_NAME" eeacms/gitflow /checkSonarqubemaster.sh | grep -v "Found script" | tee checkresult.txt'''
+             }
+
+            publishChecks name: 'SonarQube', title: 'Sonarqube Code Quality Check', summary: "Quality check on the SonarQube metrics from branch develop, comparing it with the ones from master branch. No bugs are allowed",
+                          text: readFile(file: 'checkresult.txt'), conclusion: "${currentBuild.currentResult}",
+                          detailsURL: "${env.BUILD_URL}display/redirect"
+          }
+        }
+      }
+    }
 
     stage('Pull Request') {
       when {

package/Makefile

@@ -1,39 +1,126 @@
-SHELL=/bin/bash
+##############################################################################
+# Run:
+#    make
+#    make start
+#
+# Go to:
+#
+#     http://localhost:3000
+#
+# Cypress:
+#
+#    make cypress-open
+#
+##############################################################################
+# SETUP MAKE
+#
+## Defensive settings for make: https://tech.davis-hansson.com/p/make/
+SHELL:=bash
+.ONESHELL:
+# for Makefile debugging purposes add -x to the .SHELLFLAGS
+.SHELLFLAGS:=-eu -o pipefail -O inherit_errexit -c
+.SILENT:
+.DELETE_ON_ERROR:
+MAKEFLAGS+=--warn-undefined-variables
+MAKEFLAGS+=--no-builtin-rules
 
+# Colors
+# OK=Green, warn=yellow, error=red
+ifeq ($(TERM),)
+# no colors if not in terminal
+        MARK_COLOR=
+        OK_COLOR=
+        WARN_COLOR=
+        ERROR_COLOR=
+        NO_COLOR=
+else
+        MARK_COLOR=`tput setaf 6`
+        OK_COLOR=`tput setaf 2`
+        WARN_COLOR=`tput setaf 3`
+        ERROR_COLOR=`tput setaf 1`
+        NO_COLOR=`tput sgr0`
+endif
+
+##############################################################################
+# SETTINGS AND VARIABLE
 DIR=$(shell basename $$(pwd))
-ADDON ?= "@eeacms/volto-clms-theme"
-
-# We like colors
-# From: https://coderwall.com/p/izxssa/colored-makefile-for-golang-projects
-RED=`tput setaf 1`
-GREEN=`tput setaf 2`
-RESET=`tput sgr0`
-YELLOW=`tput setaf 3`
-
-project:
-	npm install -g yo
-	npm install -g @plone/generator-volto
-	npm install -g mrs-developer
-	yo @plone/volto project --addon ${ADDON} --workspace "src/addons/${DIR}" --no-interactive
-	ln -sf $$(pwd) project/src/addons/
-	cp .project.eslintrc.js .eslintrc.js
-	cd project && yarn
-	@echo "-------------------"
-	@echo "$(GREEN)Volto project is ready!$(RESET)"
-	@echo "$(RED)Now run: cd project && yarn start$(RESET)"
-
-all: project
-
-.PHONY: start-test-backend
-start-test-backend: ## Start Test Plone Backend
-	@echo "$(GREEN)==> Start Test Plone Backend$(RESET)"
-	docker run -i --rm -e ZSERVER_HOST=0.0.0.0 -e ZSERVER_PORT=55001 -p 55001:55001 -e SITE=plone -e APPLY_PROFILES=plone.app.contenttypes:plone-content,plone.restapi:default,kitconcept.volto:default-homepage -e CONFIGURE_PACKAGES=plone.app.contenttypes,plone.restapi,kitconcept.volto,kitconcept.volto.cors -e ADDONS='plone.app.robotframework plone.app.contenttypes plone.restapi kitconcept.volto' plone ./bin/robot-server plone.app.robotframework.testing.PLONE_ROBOT_TESTING
-
-.PHONY: start-backend-docker
-start-backend-docker:		## Starts a Docker-based backend
-	@echo "$(GREEN)==> Start Docker-based Plone Backend$(RESET)"
-	docker run -it --rm --name=plone -p 8080:8080 -e SITE=Plone -e ADDONS="kitconcept.volto" -e ZCML="kitconcept.volto.cors" plone
+NODE_MODULES?="../../../node_modules"
+PLONE_VERSION?=6
+VOLTO_VERSION?=16
+ADDON_PATH="${DIR}"
+ADDON_NAME="@eeacms/${ADDON_PATH}"
+DOCKER_COMPOSE=PLONE_VERSION=${PLONE_VERSION} VOLTO_VERSION=${VOLTO_VERSION} ADDON_NAME=${ADDON_NAME} ADDON_PATH=${ADDON_PATH} docker compose
+
+# Top-level targets
+.PHONY: all
+all: clean install
+
+.PHONY: clean
+clean:			## Cleanup development environment
+	${DOCKER_COMPOSE} down --volumes --remove-orphans
+
+.PHONY: install
+install:		## Build and install development environment
+	echo "Running:	${DOCKER_COMPOSE} build"
+	${DOCKER_COMPOSE} pull
+	${DOCKER_COMPOSE} build
+
+.PHONY: start
+start:			## Start development environment
+	echo "Running:	${DOCKER_COMPOSE} up"
+	${DOCKER_COMPOSE} up
+
+.PHONY: cypress-open
+cypress-open:		## Open cypress integration tests
+	NODE_ENV=development  $(NODE_MODULES)/cypress/bin/cypress open
+
+.PHONY: cypress-run
+cypress-run:	## Run cypress integration tests
+	NODE_ENV=development  $(NODE_MODULES)/cypress/bin/cypress run
+
+.PHONY: test
+test:			## Run jest tests
+	${DOCKER_COMPOSE} run -e CI=1 frontend test
+
+.PHONY: test-update
+test-update:	## Update jest tests snapshots
+	${DOCKER_COMPOSE} run -e CI=1 frontend test -u
+
+.PHONY: stylelint
+stylelint:		## Stylelint
+	$(NODE_MODULES)/stylelint/bin/stylelint.js --allow-empty-input 'src/**/*.{css,less}'
+
+.PHONY: stylelint-overrides
+stylelint-overrides:
+	$(NODE_MODULES)/.bin/stylelint --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
+
+.PHONY: prettier
+prettier:		## Prettier
+	$(NODE_MODULES)/.bin/prettier --single-quote --check 'src/**/*.{js,jsx,json,css,less,md}'
+
+.PHONY: prettier-fix
+prettier-fix:	## Fix prettier
+	$(NODE_MODULES)/.bin/prettier --single-quote  --write 'src/**/*.{js,jsx,json,css,less,md}'
+
+.PHONY: lint
+lint:			## ES Lint
+	$(NODE_MODULES)/eslint/bin/eslint.js --max-warnings=0 'src/**/*.{js,jsx}'
+
+.PHONY: lint-fix
+lint-fix:		## Fix ES Lint
+	$(NODE_MODULES)/eslint/bin/eslint.js --fix 'src/**/*.{js,jsx}'
+
+.PHONY: i18n
+i18n:			## i18n
+	rm -rf build/messages
+	NODE_ENV=development $(NODE_MODULES)/.bin/i18n --addon
 
 .PHONY: help
-help:		## Show this help.
+help:                   ## Show this help.
 	@echo -e "$$(grep -hE '^\S+:.*##' $(MAKEFILE_LIST) | sed -e 's/:.*##\s*/:/' -e 's/^\(.\+\):\(.*\)/\\x1b[36m\1\\x1b[m:\2/' | column -c2 -t -s :)"
+	head -n 14 Makefile

package/README.md

@@ -14,23 +14,35 @@
 [![Bugs](https://sonarqube.eea.europa.eu/api/project_badges/measure?project=volto-clms-theme-develop&metric=bugs)](https://sonarqube.eea.europa.eu/dashboard?id=volto-clms-theme-develop)
 [![Duplicated Lines (%)](https://sonarqube.eea.europa.eu/api/project_badges/measure?project=volto-clms-theme-develop&metric=duplicated_lines_density)](https://sonarqube.eea.europa.eu/dashboard?id=volto-clms-theme-develop)
 
+
 [Volto](https://github.com/plone/volto) add-on
 
 ## Features
 
+Demo GIF
+
 ## Getting started
 
-1. Create new volto project if you don't already have one:
+### Try volto-clms-theme with Docker
 
-   ```
-   $ npm install -g yo @plone/generator-volto
-   $ yo @plone/volto my-volto-project --addon @eeacms/volto-clms-theme
+      git clone https://github.com/eea/volto-clms-theme.git
+      cd volto-clms-theme
+      make
+      make start
+
+Go to http://localhost:3000
+
+### Add volto-clms-theme to your Volto project
+
+1. Make sure you have a [Plone backend](https://plone.org/download) up-and-running at http://localhost:8080/Plone
 
-   $ cd my-volto-project
-   $ yarn add -W @eeacms/volto-clms-theme
+   ```Bash
+   docker compose up backend
    ```
 
-1. If you already have a volto project, just update `package.json`:
+1. Start Volto frontend
+
+* If you already have a volto project, just update `package.json`:
 
    ```JSON
    "addons": [
@@ -38,95 +50,32 @@
    ],
 
    "dependencies": {
-       "@eeacms/volto-clms-theme": "^1.0.0"
+       "@eeacms/volto-clms-theme": "*"
    }
    ```
 
-1. Install new add-ons and restart Volto:
-
-   ```
-   $ yarn
-   $ yarn start
-   ```
-
-1. Go to http://localhost:3000
-
-1. Happy editing!
-
-## Release
-
-### Automatic release using Jenkins
-
-*  The automatic release is started by creating a [Pull Request](../../compare/master...develop) from `develop` to `master`. The pull request status checks correlated to the branch and PR Jenkins jobs need to be processed successfully. 1 review from a github user with rights is mandatory.
-* It runs on every commit on `master` branch, which is protected from direct commits, only allowing pull request merge commits.
-* The automatic release is done by [Jenkins](https://ci.eionet.europa.eu). The status of the release job can be seen both in the `README.md` badges and the green check/red cross/yellow circle near the last commit information. If you click on the icon, you will have the list of checks that were run. The `continuous-integration/jenkins/branch` link goes to the Jenkins job execution webpage.
-* Automated release scripts are located in the `eeacms/gitflow` docker image, specifically [js-release.sh](https://github.com/eea/eea.docker.gitflow/blob/master/src/js-release.sh) script. It  uses the `release-it` tool.
-* As long as a PR request is open from develop to master, the PR Jenkins job will automatically re-create the CHANGELOG.md and package.json files to be production-ready.
-* The version format must be MAJOR.MINOR.PATCH. By default, next release is set to next minor version (with patch 0).
-* You can manually change the version in `package.json`.  The new version must not be already present in the tags/releases of the repository, otherwise it will be automatically increased by the script. Any changes to the version will trigger a `CHANGELOG.md` re-generation.
-* Automated commits and commits with [JENKINS] or [YARN] in the commit log are excluded from `CHANGELOG.md` file.
-
-### Manual release from the develop branch ( beta release )
-
-#### Installation and configuration of release-it
-
-You need to first install the [release-it](https://github.com/release-it/release-it)  client.
-
-   ```
-   npm install -g release-it
-   ```
-
-Release-it uses the configuration written in the [`.release-it.json`](./.release-it.json) file located in the root of the repository.
-
-Release-it is a tool that automates 4 important steps in the release process:
-
-1. Version increase in `package.json` ( increased from the current version in `package.json`)
-2. `CHANGELOG.md` automatic generation from commit messages ( grouped by releases )
-3. GitHub release on the commit with the changelog and package.json modification on the develop branch
-4. NPM release ( by default it's disabled, but can be enabled in the configuration file )
-
-To configure the authentification, you need to export GITHUB_TOKEN for [GitHub](https://github.com/settings/tokens)
+* If not, create one:
 
    ```
-   export GITHUB_TOKEN=XXX-XXXXXXXXXXXXXXXXXXXXXX
+   npm install -g yo @plone/generator-volto
+   yo @plone/volto my-volto-project --canary --addon @eeacms/volto-clms-theme
+   cd my-volto-project
    ```
 
- To configure npm, you can use the `npm login` command or use a configuration file with a TOKEN :
+1. Install new add-ons and restart Volto:
 
    ```
-   echo "//registry.npmjs.org/:_authToken=YYYYYYYYYYYYYYYYYYYYYYYYYYYYYY" > .npmrc
+   yarn
+   yarn start
    ```
 
-#### Using release-it tool
-
-There are 3 yarn scripts that can be run to do the release
-
-##### yarn release-beta
-
-Automatically calculates and presents 3 beta versions - patch, minor and major for you to choose ( or Other for manual input).
-
-```
-? Select increment (next version):
-❯ prepatch (0.1.1-beta.0)
-  preminor (0.2.0-beta.0)
-  premajor (1.0.0-beta.0)
-  Other, please specify...
-```
-
-##### yarn release-major-beta
-
-Same as `yarn release-beta`, but with premajor version pre-selected.
-
-##### yarn release
-
-Generic command, does not automatically add the `beta` to version, but you can still manually write it if you choose Other.
-
-#### Important notes
+1. Go to http://localhost:3000
 
-> 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.
+1. Happy editing!
 
-> 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).
+## Release
 
+See [RELEASE.md](https://github.com/eea/volto-clms-theme/blob/master/RELEASE.md).
 
 ## How to contribute
 

package/docker-compose.yml

@@ -0,0 +1,28 @@
+version: "3"
+services:
+  backend:
+    image: plone/plone-backend:${PLONE_VERSION:-6}
+    ports:
+      - "8080:8080"
+    environment:
+      SITE: "Plone"
+
+  frontend: 
+    build:
+      context: ./
+      dockerfile: ./Dockerfile
+      args:
+        ADDON_NAME: "${ADDON_NAME}"
+        ADDON_PATH: "${ADDON_PATH}"
+        VOLTO_VERSION: ${VOLTO_VERSION:-16}
+    ports:
+    - "3000:3000"
+    - "3001:3001"
+    depends_on:
+      - backend
+    volumes:
+      - ./:/app/src/addons/${ADDON_PATH}
+    environment:
+      RAZZLE_INTERNAL_API_PATH: "http://backend:8080/Plone"
+      RAZZLE_DEV_PROXY_API_PATH: "http://backend:8080/Plone"
+      HOST: "0.0.0.0"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-clms-theme",
-  "version": "1.1.29",
+  "version": "1.1.31",
   "description": "volto-clms-theme: Volto theme for CLMS site",
   "main": "src/index.js",
   "author": "CodeSyntax for the European Environment Agency",

package/src/components/Blocks/CustomTemplates/VoltoSearchBlock/rewriteOptions.js

@@ -45,13 +45,13 @@ const rewriteOptions = (name, choices) => {
     'Product',
     'DataSet',
     'TechnicalLibrary',
+    'FAQ',
     'UseCase',
     'News Item',
     'eea.meeting',
     'Tender',
     'WorkOpportunity',
     'Document',
-    'FAQ',
   ];
 
   const dataset_geographical_classification = [

package/src/components/CLMSDownloadsView/CLMSDownloadsView.jsx

@@ -50,13 +50,19 @@ const CLMSDownloadsView = (props) => {
       id: 'Downloads',
       defaultMessage: 'Downloads',
     },
+    HistoricCartDownloads: {
+      id: 'Historic downloads',
+      defaultMessage: 'Historic downloads',
+    },
   });
 
   useEffect(() => {
     dispatch(
       getExtraBreadcrumbItems([
         {
-          title: formatMessage(messages.CartDownloads),
+          title: props.historicView
+            ? formatMessage(messages.HistoricCartDownloads)
+            : formatMessage(messages.CartDownloads),
           pathname: props.location.pathname,
         },
       ]),
@@ -69,7 +75,9 @@ const CLMSDownloadsView = (props) => {
     dispatch,
     formatMessage,
     messages.CartDownloads,
+    messages.HistoricCartDownloads,
     props.location.pathname,
+    props.historicView,
   ]);
 
   function getUIDList(download_data) {
@@ -137,9 +145,16 @@ const CLMSDownloadsView = (props) => {
   }, [dispatch, downloadtool.delete_download_in_progress]);
 
   return (
-    <>
+    <div className="ccl-container ">
       <Helmet
-        title={helmetTitle(formatMessage(messages.CartDownloads), content)}
+        title={
+          props.historicView
+            ? helmetTitle(
+                formatMessage(messages.HistoricCartDownloads),
+                content,
+              )
+            : helmetTitle(formatMessage(messages.CartDownloads), content)
+        }
       />
       <div className="ui container">
         {!isLoggedIn && (
@@ -160,20 +175,22 @@ const CLMSDownloadsView = (props) => {
         {isLoggedIn && (
           <>
             <h1 className="page-title">
-              {formatMessage(messages.CartDownloads)}
+              {props.historicView
+                ? formatMessage(messages.HistoricCartDownloads)
+                : formatMessage(messages.CartDownloads)}
             </h1>
             <div className="ccl-container">
               <Segment
                 basic
                 loading={downloadtool.loading || datasetsByUid.loading}
               >
-                <CLMSDownloadTask />
+                <CLMSDownloadTask all={props.historicView} />
               </Segment>
             </div>
           </>
         )}
       </div>
-    </>
+    </div>
   );
 };
 

package/src/components/CLMSDownloadsView/HistoricHOC.jsx

@@ -0,0 +1,7 @@
+import React from 'react';
+
+const HistoricHOC = (CLMSDownloadsView) =>
+  function Component(props) {
+    return <CLMSDownloadsView {...props} {...{ historicView: true }} />;
+  };
+export default HistoricHOC;

package/src/components/CLMSMeetingView/styles.less

@@ -2,11 +2,6 @@
 @element: 'custom';
 @import (multiple) '../../theme.config';
 
-h1,
-p {
-  font-family: Lato;
-}
-
 body {
   margin: 0;
 }
@@ -42,7 +37,7 @@ body {
   display: flex;
   flex-wrap: wrap;
 }
-@media (ma-width: 770px) {
+@media (max-width: 770px) {
   .lightgallery .lg-react-element {
     justify-content: center;
   }

package/src/components/CclTab/CclTab.jsx

@@ -21,7 +21,7 @@ function CclTab(props) {
     currentLocation = '',
   } = props;
   const token = useSelector((state) => state.userSession?.token);
-  function onTabClick() {
+  function onTabClick(e) {
     onClick(tabId);
   }
   const [redirecting, setRedirecting] = React.useState(false);

package/src/customizations/volto/components/manage/Widgets/TextareaWidget.jsx

@@ -27,7 +27,7 @@ const TextareaWidget = (props) => {
   const [lengthError, setlengthError] = useState('');
 
   const onhandleChange = (id, value) => {
-    if (maxLength & value?.length) {
+    if (maxLength && value?.length) {
       let remlength = maxLength - value.length;
       if (remlength < 0) {
         setlengthError(

package/src/index.js

@@ -10,7 +10,7 @@ import CLMSDatasetDetailView from '@eeacms/volto-clms-theme/components/CLMSDatas
 import CLMSDownloadCartView from './components/CLMSDownloadCartView/CLMSDownloadCartView';
 import CLMSDownloadableFileView from '@eeacms/volto-clms-theme/components/CLMSDownloadableFileView/CLMSDownloadableFileView';
 import CLMSDownloadsView from './components/CLMSDownloadsView/CLMSDownloadsView';
-import CLMSHistoricDownloadsView from './components/CLMSDownloadsView/CLMSHistoricDownloadsView';
+import HistoricHOC from './components/CLMSDownloadsView/HistoricHOC';
 import CLMSMapViewerView from './components/CLMSMapViewerView/CLMSMapViewerView';
 import CLMSMeetingEmailView from '@eeacms/volto-clms-theme/components/CLMSMeetingView/CLMSMeetingEmailView';
 import CLMSMeetingEmailsView from '@eeacms/volto-clms-theme/components/CLMSMeetingView/CLMSMeetingEmailsView';
@@ -275,7 +275,7 @@ const applyConfig = (config) => {
     },
     {
       path: '/**/all-downloads',
-      component: CLMSHistoricDownloadsView,
+      component: HistoricHOC(CLMSDownloadsView),
     },
     {
       path: `/(${config.settings.supportedLanguages.join('|')})/sitemap`,

package/src/components/CLMSDownloadsView/CLMSHistoricDownloadsView.jsx

@@ -1,180 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import { defineMessages, useIntl } from 'react-intl';
-import { useDispatch, useSelector } from 'react-redux';
-import { Segment } from 'semantic-ui-react';
-
-import { Forbidden, Unauthorized } from '@plone/volto/components';
-import { Helmet } from '@plone/volto/helpers';
-import { helmetTitle } from '@eeacms/volto-clms-theme/components/CclUtils';
-import useCartState from '@eeacms/volto-clms-utils/cart/useCartState';
-
-import {
-  getDatasetsByUid,
-  getExtraBreadcrumbItems,
-  getDownloadtool,
-} from '../../actions';
-import CLMSDownloadTask from './CLMSDownloadTasks';
-
-/**
- * CLMSDownloadsView.
- * @module components/CLMSDownloadsView/CLMSDownloadsView
- */
-
-const useInterval = (f, delay) => {
-  const [timer, setTimer] = useState(undefined);
-  const start = () => {
-    if (timer) return;
-    setTimer(setInterval(f, delay));
-  };
-  const stop = () => {
-    if (!timer) return;
-    setTimer(clearInterval(timer));
-  };
-  // eslint-disable-next-line react-hooks/exhaustive-deps
-  useEffect(() => stop, []);
-  return start;
-};
-
-const CLMSDownloadsView = (props) => {
-  const dispatch = useDispatch();
-  const downloadtool = useSelector((state) => state.downloadtool);
-  const datasetsByUid = useSelector((state) => state.datasetsByUid);
-  const content = useSelector((state) => state.content.data);
-  /* DISPATCH THE getDownloadtool ACTION EVERY 60 SECONDS */
-  const start = useInterval((_) => dispatch(getDownloadtool()), 60000);
-  const { isLoggedIn } = useCartState();
-
-  const { formatMessage } = useIntl();
-  const messages = defineMessages({
-    CartDownloads: {
-      id: 'Historic downloads',
-      defaultMessage: 'Historic downloads',
-    },
-  });
-
-  useEffect(() => {
-    dispatch(
-      getExtraBreadcrumbItems([
-        {
-          title: formatMessage(messages.CartDownloads),
-          pathname: props.location.pathname,
-        },
-      ]),
-    );
-    // returned function will be called on component unmount
-    return () => {
-      dispatch(getExtraBreadcrumbItems([]));
-    };
-  }, [
-    dispatch,
-    formatMessage,
-    messages.CartDownloads,
-    props.location.pathname,
-  ]);
-
-  function getUIDList(download_data) {
-    let uidList = [];
-    let data_keys = Object.keys(download_data);
-    if (data_keys?.length !== 0) {
-      uidList = [
-        ...new Set(
-          data_keys
-            .map((taskID) =>
-              download_data[taskID].Datasets.map(
-                (dataset) => dataset.DatasetID,
-              ),
-            )
-            .reduce((elem1, elem2) => elem1.concat(elem2)),
-        ),
-      ];
-    }
-    return uidList;
-  }
-
-  useEffect(() => {
-    if (
-      downloadtool?.download_queued &&
-      downloadtool?.download_in_progress &&
-      downloadtool?.download_finished_ok &&
-      downloadtool?.download_finished_nok &&
-      downloadtool?.download_rejected &&
-      downloadtool?.download_cancelled
-    ) {
-      let queuedUidsList = getUIDList(downloadtool.download_queued);
-      let downloadInProgressUidsList = getUIDList(
-        downloadtool?.download_in_progress,
-      );
-      let finishedOKUidsList = getUIDList(downloadtool?.download_finished_ok);
-      let finishedNOKUidsList = getUIDList(downloadtool?.download_finished_nok);
-      let rejectedUidsList = getUIDList(downloadtool?.download_rejected);
-      let cancelledUidsList = getUIDList(downloadtool?.download_cancelled);
-      let uidsList = [
-        ...new Set(
-          rejectedUidsList.concat(
-            finishedNOKUidsList.concat(
-              finishedOKUidsList.concat(
-                downloadInProgressUidsList.concat(
-                  queuedUidsList.concat(cancelledUidsList),
-                ),
-              ),
-            ),
-          ),
-        ),
-      ];
-      if (uidsList.length > 0) {
-        dispatch(getDatasetsByUid(uidsList));
-      }
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [downloadtool, dispatch]);
-
-  useEffect(() => {
-    if (downloadtool.delete_download_in_progress) {
-      dispatch(getDownloadtool());
-      start();
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [dispatch, downloadtool.delete_download_in_progress]);
-
-  return (
-    <div className="ccl-container ">
-      <Helmet
-        title={helmetTitle(formatMessage(messages.CartDownloads), content)}
-      />
-      <div className="ui container">
-        {!isLoggedIn && (
-          <>
-            {props.token ? (
-              <Forbidden
-                pathname={props.pathname}
-                staticContext={props.staticContext}
-              />
-            ) : (
-              <Unauthorized
-                pathname={props.pathname}
-                staticContext={props.staticContext}
-              />
-            )}
-          </>
-        )}
-        {isLoggedIn && (
-          <>
-            <h1 className="page-title">
-              {formatMessage(messages.CartDownloads)}
-            </h1>
-            <div className="ccl-container">
-              <Segment
-                basic
-                loading={downloadtool.loading || datasetsByUid.loading}
-              >
-                <CLMSDownloadTask all={true} />
-              </Segment>
-            </div>
-          </>
-        )}
-      </div>
-    </div>
-  );
-};
-
-export default CLMSDownloadsView;