Merge pull request #4 from eea/develop

Release
eea · Apr 13, 2022 · d596f06 · d596f06
2 parents d13f70a + d56a58e
commit d596f06
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,10 +4,17 @@ 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).
 
+#### [0.2.2](https://github.com/eea/volto-slate-label/compare/0.2.1...0.2.2)
+
+- fix: labelElement should return an inline `&lt;label&gt;` instead of block ele `div` [`#3`](https://github.com/eea/volto-slate-label/pull/3)
+- fix(label): Default array not allowed in Popup className [`b960e3e`](https://github.com/eea/volto-slate-label/commit/b960e3ed2d34ccaa0d8f52c07df26bccbc722c8d)
+
 #### [0.2.1](https://github.com/eea/volto-slate-label/compare/0.2.0...0.2.1)
 
+> 5 April 2022
+
+- docs(label): Add screenshot to README [`#2`](https://github.com/eea/volto-slate-label/pull/2)
 - docs(label): Add link to EEA Design system label [`b296d0f`](https://github.com/eea/volto-slate-label/commit/b296d0f326d9a6a990a4d7c427eba4a0e3fddc0f)
-- docs(label): Add screenshot to README [`49a6088`](https://github.com/eea/volto-slate-label/commit/49a60885a2f5f64d79c449cb4197079674b00cf0)
 
 #### [0.2.0](https://github.com/eea/volto-slate-label/compare/0.1.0...0.2.0)
 

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -4,7 +4,7 @@ pipeline {
   environment {
         GIT_NAME = "volto-slate-label"
         NAMESPACE = "@eeacms"
-        SONARQUBE_TAGS = "volto.eea.europa.eu"
+        SONARQUBE_TAGS = "volto.eea.europa.eu,demo-www.eea.europa.eu"
         DEPENDENCIES = ""
     }
 
@@ -184,10 +184,10 @@ pipeline {
             unstash "xunit-reports"
             unstash "cypress-coverage"
             def scannerHome = tool 'SonarQubeScanner';
-            def nodeJS = tool 'NodeJS11';
+            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 "export PATH=$PATH:${scannerHome}/bin:${nodeJS}/bin; 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,./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'''
             }
           }

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-slate-label",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "@eeacms/volto-slate-label: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",

diff --git a/src/editor/LabelWrapper.jsx b/src/editor/LabelWrapper.jsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { Popup, Label } from 'semantic-ui-react';
+import { Popup } from 'semantic-ui-react';
 import cx from 'classnames';
 import {
   serializeNodes,
@@ -21,9 +21,11 @@ const LabelWrapper = (props) => {
       on={!data.always_show && 'click'}
       trigger={
         label_type ? (
-          <Label className={cx(label_type, label_pointing, 'with-popup')}>
+          <label
+            className={cx(label_type, label_pointing, 'with-popup ui label')}
+          >
             {children}
-          </Label>
+          </label>
         ) : (
           <span
             id={`label_ref-${uid}`}
@@ -39,7 +41,9 @@ const LabelWrapper = (props) => {
       {serializeNodes(data.tooltip_content)}
     </Popup>
   ) : (
-    <Label className={cx(label_type, label_pointing)}>{children}</Label>
+    <label className={cx(label_type, label_pointing, 'ui label')}>
+      {children}
+    </label>
   );
 };
 

diff --git a/src/editor/schema.js b/src/editor/schema.js
@@ -67,7 +67,7 @@ export const LabelEditorSchema = {
         ['high', 'High importance'],
         ['highlight', 'Highlight'],
       ],
-      default: ['highlight', 'highlight'],
+      default: '',
     },
     always_show: {
       title: 'Always show',