Merge pull request #51 from eea/develop

Add theme variations - refs #153783
eea · Sep 27, 2022 · e30d433 · e30d433
2 parents b84c110 + dcb963b
commit e30d433
Show file tree

Hide file tree

Showing 14 changed files with 398 additions and 279 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -4,9 +4,9 @@ pipeline {
   environment {
         GIT_NAME = "volto-accordion-block"
         NAMESPACE = "@eeacms"
-        SONARQUBE_TAGS = "volto.eea.europa.eu,forest.eea.europa.eu,www.eea.europa.eu-ims,climate-energy.eea.europa.eu,sustainability.eionet.europa.eu,biodiversity.europa.eu,clms.land.copernicus.eu,industry.eea.europa.eu,water.europa.eu-freshwater,demo-www.eea.europa.eu,clmsdemo.devel6cph.eea.europa.eu,circularity.eea.europa.eu"
+        SONARQUBE_TAGS = "volto.eea.europa.eu,forest.eea.europa.eu,www.eea.europa.eu-ims,climate-energy.eea.europa.eu,sustainability.eionet.europa.eu,biodiversity.europa.eu,clms.land.copernicus.eu,industry.eea.europa.eu,water.europa.eu-freshwater,demo-www.eea.europa.eu,clmsdemo.devel6cph.eea.europa.eu,circularity.eea.europa.eu,prod-www.eea.europa.eu"
         DEPENDENCIES = ""
-        VOLTO = "alpha"
+        VOLTO = "16.0.0-alpha.14"
     }
 
   stages {

diff --git a/jest-addon.config.js b/jest-addon.config.js
@@ -11,7 +11,8 @@ module.exports = {
     '@package/(.*)$': '<rootDir>/src/$1',
     '@plone/volto-quanta/(.*)$': '<rootDir>/src/addons/volto-quanta/src/$1',
     '@eeacms/(.*?)/(.*)$': '<rootDir>/src/addons/$1/src/$2',
-    'volto-slate/(.*)$': '<rootDir>/src/addons/volto-slate/src/$1',
+    '@plone/volto-slate':
+      '<rootDir>/node_modules/@plone/volto/packages/volto-slate/src',
     '~/(.*)$': '<rootDir>/src/$1',
     'load-volto-addons':
       '<rootDir>/node_modules/@plone/volto/jest-addons-loader.js',

diff --git a/locales/de/LC_MESSAGES/volto.po b/locales/de/LC_MESSAGES/volto.po
@@ -17,53 +17,91 @@ msgstr ""
 "X-Is-Fallback-For: de-at de-li de-lu de-ch de-de\n"
 
 #: components/manage/Blocks/Accordion/Schema
+# defaultMessage: Accordion
 msgid "Accordion"
 msgstr "Akkordeon"
 
 #: components/manage/Blocks/Accordion/Schema
+# defaultMessage: Accordion Title size
 msgid "Accordion Title size"
 msgstr "Akkordeon Schriftgröße Titel"
 
+#: components/manage/Blocks/Accordion/Schema
+# defaultMessage: Accordion theme
+msgid "Accordion theme"
+msgstr "Akkordeon-Thema"
+
 #: components/manage/Widgets/PanelsWidget
+# defaultMessage: Add
 msgid "Add"
-msgstr ""
+msgstr "Hinzufügen"
 
 #: components/manage/Blocks/Accordion/Schema
+# defaultMessage: Allow multiple panels open at a time
 msgid "Allow multiple panels open at a time"
 msgstr "Erlaube mehrere Panele zur gleichen Zeit geöffnet zu haben"
 
 #: components/manage/Blocks/Accordion/Schema
+# defaultMessage: Collapsed by default
 msgid "Collapsed by default"
 msgstr "Eingeklappt ist der Standard"
 
 #: components/manage/Blocks/Accordion/Schema
+# defaultMessage: Friendly name
 msgid "Friendly name"
 msgstr "Kurzname"
 
 #: components/manage/Blocks/Accordion/Schema
+# defaultMessage: Non exclusive
 msgid "Non exclusive"
 msgstr "Nicht ausschließend"
 
 #: components/manage/Blocks/Accordion/Schema
-msgid "Style"
-msgstr "Aussehen"
+# defaultMessage: Options
+msgid "Options"
+msgstr "Optionen"
+
+#: components/manage/Blocks/Accordion/Schema
+# defaultMessage: Primary
+msgid "Primary"
+msgstr "Primär"
+
+#: components/manage/Blocks/Accordion/Schema
+# defaultMessage: Secondary
+msgid "Secondary"
+msgstr "Sekundär"
+
+#: components/manage/Blocks/Accordion/Schema
+# defaultMessage: Tertiary
+msgid "Tertiary"
+msgstr "Tertiär"
+
+#: components/manage/Blocks/Accordion/Schema
+# defaultMessage: Theme
+msgid "Theme"
+msgstr "Thema"
 
 #: components/manage/Blocks/Accordion/Schema
+# defaultMessage: Title
 msgid "Title"
 msgstr "Titel"
 
 #: components/manage/Blocks/Accordion/Schema
+# defaultMessage: Title Icon on the right
 msgid "Title Icon on the right"
 msgstr "Titel-Icon auf der rechten Seite anzeigen"
 
 #: components/manage/Blocks/Accordion/Schema
+# defaultMessage: Title size
 msgid "Title size"
 msgstr "Schriftgröße Titel"
 
 #: components/manage/Blocks/Accordion/EditBlockWrapper
+# defaultMessage: Unknown Block {block}
 msgid "Unknown Block"
 msgstr "Unbekannter Block"
 
 #: components/manage/Blocks/Accordion/EditBlockWrapper
+# defaultMessage: delete
 msgid "delete"
 msgstr "löschen"
diff --git a/locales/it/LC_MESSAGES/volto.po b/locales/it/LC_MESSAGES/volto.po
@@ -17,53 +17,91 @@ msgstr ""
 "X-Is-Fallback-For: it it-CH it-IT\n"
 
 #: components/manage/Blocks/Accordion/Schema
+# defaultMessage: Accordion
 msgid "Accordion"
 msgstr "Accordion"
 
 #: components/manage/Blocks/Accordion/Schema
+# defaultMessage: Accordion Title size
 msgid "Accordion Title size"
 msgstr "Dimensione del titolo"
 
+#: components/manage/Blocks/Accordion/Schema
+# defaultMessage: Accordion theme
+msgid "Accordion theme"
+msgstr "Tema della accordion"
+
 #: components/manage/Widgets/PanelsWidget
+# defaultMessage: Add
 msgid "Add"
 msgstr "Aggiungi"
 
 #: components/manage/Blocks/Accordion/Schema
+# defaultMessage: Allow multiple panels open at a time
 msgid "Allow multiple panels open at a time"
 msgstr "Consente di avere più pannelli aperti contemporaneamente"
 
 #: components/manage/Blocks/Accordion/Schema
+# defaultMessage: Collapsed by default
 msgid "Collapsed by default"
 msgstr "Collassati di default"
 
 #: components/manage/Blocks/Accordion/Schema
+# defaultMessage: Friendly name
 msgid "Friendly name"
 msgstr "Titolo dell'elemento"
 
 #: components/manage/Blocks/Accordion/Schema
+# defaultMessage: Non exclusive
 msgid "Non exclusive"
 msgstr "Non esclusivo"
 
 #: components/manage/Blocks/Accordion/Schema
-msgid "Style"
-msgstr "Stile"
+# defaultMessage: Options
+msgid "Options"
+msgstr "Opzioni"
+
+#: components/manage/Blocks/Accordion/Schema
+# defaultMessage: Primary
+msgid "Primary"
+msgstr "Primario"
+
+#: components/manage/Blocks/Accordion/Schema
+# defaultMessage: Secondary
+msgid "Secondary"
+msgstr "Secondario"
+
+#: components/manage/Blocks/Accordion/Schema
+# defaultMessage: Tertiary
+msgid "Tertiary"
+msgstr "Terziario"
+
+#: components/manage/Blocks/Accordion/Schema
+# defaultMessage: Theme
+msgid "Theme"
+msgstr "Tema"
 
 #: components/manage/Blocks/Accordion/Schema
+# defaultMessage: Title
 msgid "Title"
 msgstr "Titolo"
 
 #: components/manage/Blocks/Accordion/Schema
+# defaultMessage: Title Icon on the right
 msgid "Title Icon on the right"
 msgstr "Mostra l'icona sulla destra"
 
 #: components/manage/Blocks/Accordion/Schema
+# defaultMessage: Title size
 msgid "Title size"
 msgstr "Dimensione del titolo"
 
 #: components/manage/Blocks/Accordion/EditBlockWrapper
+# defaultMessage: Unknown Block {block}
 msgid "Unknown Block"
 msgstr "Blocco sconosciuto"
 
 #: components/manage/Blocks/Accordion/EditBlockWrapper
+# defaultMessage: delete
 msgid "delete"
 msgstr "Rimuovi"
diff --git a/locales/volto.pot b/locales/volto.pot
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Plone\n"
-"POT-Creation-Date: 2021-10-06T09:57:51.150Z\n"
+"POT-Creation-Date: 2022-09-27T08:42:53.695Z\n"
 "Last-Translator: Plone i18n <plone-i18n@lists.sourceforge.net>\n"
 "Language-Team: Plone i18n <plone-i18n@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -23,6 +23,11 @@ msgstr ""
 msgid "Accordion Title size"
 msgstr ""
 
+#: components/manage/Blocks/Accordion/Schema
+# defaultMessage: Accordion theme
+msgid "Accordion theme"
+msgstr ""
+
 #: components/manage/Widgets/PanelsWidget
 # defaultMessage: Add
 msgid "Add"
@@ -49,8 +54,28 @@ msgid "Non exclusive"
 msgstr ""
 
 #: components/manage/Blocks/Accordion/Schema
-# defaultMessage: Style
-msgid "Style"
+# defaultMessage: Options
+msgid "Options"
+msgstr ""
+
+#: components/manage/Blocks/Accordion/Schema
+# defaultMessage: Primary
+msgid "Primary"
+msgstr ""
+
+#: components/manage/Blocks/Accordion/Schema
+# defaultMessage: Secondary
+msgid "Secondary"
+msgstr ""
+
+#: components/manage/Blocks/Accordion/Schema
+# defaultMessage: Tertiary
+msgid "Tertiary"
+msgstr ""
+
+#: components/manage/Blocks/Accordion/Schema
+# defaultMessage: Theme
+msgid "Theme"
 msgstr ""
 
 #: components/manage/Blocks/Accordion/Schema

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-accordion-block",
-  "version": "3.5.0",
+  "version": "4.0.0",
   "description": "volto-accordion-block: Volto accordion block",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",

diff --git a/src/components/index.js b/src/components/index.js
@@ -1,4 +1,5 @@
 export AccordionLayoutSchema from '@eeacms/volto-accordion-block/components/manage/Blocks/Accordion/LayoutSchema';
+export { AccordionStylingSchema } from '@eeacms/volto-accordion-block/components/manage/Blocks/Accordion/Schema';
 export AccordionBlockEdit from '@eeacms/volto-accordion-block/components/manage/Blocks/Accordion/Edit';
 export AccordionBlockView from '@eeacms/volto-accordion-block/components/manage/Blocks/Accordion/View';
 export PanelsWidget from '@eeacms/volto-accordion-block/components/manage/Widgets/PanelsWidget';
diff --git a/src/components/manage/Blocks/Accordion/AccordionEdit.jsx b/src/components/manage/Blocks/Accordion/AccordionEdit.jsx
@@ -47,7 +47,7 @@ export default (props) => {
   }, [data.collapsed]);
 
   return (
-    <Accordion fluid styled>
+    <Accordion fluid styled className={data.styles?.theme}>
       <React.Fragment>
         <Accordion.Title
           as={data.title_size}

diff --git a/src/components/manage/Blocks/Accordion/Edit.jsx b/src/components/manage/Blocks/Accordion/Edit.jsx
@@ -10,7 +10,7 @@ import { useIntl } from 'react-intl';
 import AccordionEdit from './AccordionEdit';
 import EditBlockWrapper from './EditBlockWrapper';
 import './editor.less';
-import { accordionBlockSchema } from './Schema';
+import { AccordionBlockSchema } from './Schema';
 import { emptyAccordion, getPanels } from './util';
 import { cloneDeep } from 'lodash';
 import config from '@plone/volto/registry';
@@ -67,7 +67,7 @@ const Edit = (props) => {
    * @returns {Object} defaultValues
    */
   const setInitialData = () => {
-    const accordionSchema = applySchemaEnhancer(accordionBlockSchema({ intl }));
+    const accordionSchema = applySchemaEnhancer(AccordionBlockSchema({ intl }));
     const defaultValues = Object.keys(accordionSchema.properties).reduce(
       (accumulator, currentVal) => {
         return accordionSchema.properties[currentVal].default
@@ -259,7 +259,7 @@ const Edit = (props) => {
         )}
         {!data?.readOnlySettings && (
           <BlockDataForm
-            schema={accordionBlockSchema({ intl })}
+            schema={AccordionBlockSchema({ intl })}
             title="Accordion block"
             onChangeField={(id, value) => {
               onChangeBlock(block, {