diff --git a/Jenkinsfile b/Jenkinsfile
index 0288fc28..1acd8c8f 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -10,6 +10,7 @@ pipeline {
RANCHER_ENVID = "1a332957"
dockerImage = ''
tagName = ''
+ SONARQUBE_TAG = ""
}
stages {
@@ -84,6 +85,25 @@ pipeline {
}
}
+ stage('Update SonarQube Tags') {
+ when {
+ not {
+ environment name: 'SONARQUBE_TAG', value: ''
+ }
+ buildingTag()
+ }
+ steps{
+ node(label: 'docker') {
+ withSonarQubeEnv('Sonarqube') {
+ withCredentials([string(credentialsId: 'eea-jenkins-token', variable: 'GIT_TOKEN')]) {
+ sh '''docker pull eeacms/gitflow'''
+ sh '''docker run -i --rm --name="${BUILD_TAG}-sonar" -e GIT_NAME=${GIT_NAME} -e GIT_TOKEN="${GIT_TOKEN}" -e SONARQUBE_TAG=${SONARQUBE_TAG} -e SONARQUBE_TOKEN=${SONAR_AUTH_TOKEN} -e SONAR_HOST_URL=${SONAR_HOST_URL} eeacms/gitflow /update_sonarqube_tags.sh'''
+ }
+ }
+ }
+ }
+ }
+
stage('Upgrade demo') {
when {
buildingTag()
@@ -102,23 +122,21 @@ pipeline {
}
post {
+ always {
+ cleanWs(cleanWhenAborted: true, cleanWhenFailure: true, cleanWhenNotBuilt: true, cleanWhenSuccess: true, cleanWhenUnstable: true, deleteDirs: true)
+ }
changed {
script {
- def url = "${env.BUILD_URL}/display/redirect"
- def status = currentBuild.currentResult
- def subject = "${status}: Job '${env.JOB_NAME} [${env.BUILD_NUMBER}]'"
- def summary = "${subject} (${url})"
- def details = """${env.JOB_NAME} - Build #${env.BUILD_NUMBER} - ${status}
- Check console output at ${env.JOB_BASE_NAME} - #${env.BUILD_NUMBER}
+ def details = """${env.JOB_NAME} - Build #${env.BUILD_NUMBER} - ${currentBuild.currentResult}
+ Check console output at ${env.JOB_BASE_NAME} - #${env.BUILD_NUMBER}
"""
-
- def color = '#FFFF00'
- if (status == 'SUCCESS') {
- color = '#00FF00'
- } else if (status == 'FAILURE') {
- color = '#FF0000'
- }
- emailext (subject: '$DEFAULT_SUBJECT', to: '$DEFAULT_RECIPIENTS', body: details)
+ emailext(
+ subject: '$DEFAULT_SUBJECT',
+ body: details,
+ attachLog: true,
+ compressLog: true,
+ recipientProviders: [[$class: 'DevelopersRecipientProvider'], [$class: 'CulpritsRecipientProvider']]
+ )
}
}
}
diff --git a/README.md b/README.md
index 68926242..1c0d0edb 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
# EPRTR: Volto Frontend
-[](https://ci.eionet.europa.eu/view/Github/job/eprtr.eea.europa.eu/job/eprtr_frontend/job/master/display/redirect)
+[](https://ci.eionet.europa.eu/view/Github/job/volto/job/eprtr_frontend/job/master/display/redirect)
[](https://github.com/eea/eprtr_frontend/releases)
## Documentation
diff --git a/src/components/manage/Blocks/BlocksWrapper/Edit.jsx b/src/components/manage/Blocks/BlocksWrapper/Edit.jsx
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/components/manage/Blocks/BlocksWrapper/View.jsx b/src/components/manage/Blocks/BlocksWrapper/View.jsx
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/components/manage/Blocks/SiteBlocks/EnvironmentalFacilityDetails/View.jsx b/src/components/manage/Blocks/SiteBlocks/EnvironmentalFacilityDetails/View.jsx
index 911a8291..f267f639 100644
--- a/src/components/manage/Blocks/SiteBlocks/EnvironmentalFacilityDetails/View.jsx
+++ b/src/components/manage/Blocks/SiteBlocks/EnvironmentalFacilityDetails/View.jsx
@@ -63,6 +63,10 @@ const View = (props) => {
{facilities[0]?.facilityMainActivity}
+ Facility address
+
+ {facilities[0]?.facilityAddress}
+
) : (
''
diff --git a/src/components/manage/Blocks/SiteBlocks/style.css b/src/components/manage/Blocks/SiteBlocks/style.css
index c636b9f9..d21ea89f 100644
--- a/src/components/manage/Blocks/SiteBlocks/style.css
+++ b/src/components/manage/Blocks/SiteBlocks/style.css
@@ -42,6 +42,11 @@ h3.orange {
margin-bottom: 0;
}
+.site-block > .address {
+ font-weight: bold;
+ margin-bottom: 0;
+}
+
.site-block .ui.grid {
margin-top: 0;
margin-bottom: 0;
diff --git a/src/components/manage/Blocks/SiteLocationMap/View.jsx b/src/components/manage/Blocks/SiteLocationMap/View.jsx
index 629d04fa..7a095aec 100644
--- a/src/components/manage/Blocks/SiteLocationMap/View.jsx
+++ b/src/components/manage/Blocks/SiteLocationMap/View.jsx
@@ -10,12 +10,26 @@ import { getSiteLocationURL } from './index';
import qs from 'querystring';
import './style.css';
+// SVGs
+import mapPlaceholder from '~/components/manage/Blocks/DiscodataOpenlayersMapBlock/map_placeholder.png';
+// Privacy Protection VOLTO
+import PrivacyProtection from '~/components/manage/Blocks/DiscodataOpenlayersMapBlock/PrivacyProtection';
+
const View = (props) => {
const [options, setOptions] = React.useState({});
const [vectorSource, setVectorSource] = useState(null);
const { format, proj, source, style } = openlayers;
const { siteInspireId } = { ...props.query, ...props.discodata_query };
+ const dataprotection = {
+ enabled: true,
+ privacy_statement:
+ 'This map is hosted by a third party [Environmental Systems Research Institute, INC: "ESRI"]. By showing th external content you accept the terms and conditions of www.esri.com. This includes their cookie policies, which e have no control over.',
+ privacy_cookie_key: 'site-location-map',
+ placeholder_image: mapPlaceholder,
+ type: props.data.privacy?.value || 'big',
+ };
+
React.useState(() => {
if (__SERVER__) return;
const vs = vectorSource || new source.Vector();
@@ -54,47 +68,56 @@ const View = (props) => {
return (
-
-
+
+