Drop volto-blocks-from dependency. Use BlockForm components from Volt…

…o core
eea · Mar 8, 2021 · 55d51e1 · 55d51e1
1 parent adfec4c
commit 55d51e1
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 16 deletions.
diff --git a/DEVELOP.md b/DEVELOP.md
@@ -14,7 +14,6 @@ Before starting make sure your development environment is properly set. See [Vol
 
         $ yo @plone/volto \
              my-dev-project \
-             --addon @eeacms/volto-blocks-form \
              --addon @eeacms/volto-columns-block \
              --workspace src/addons/volto-columns-block \
              --no-interactive \

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -5,7 +5,6 @@ pipeline {
         GIT_NAME = "volto-columns-block"
         NAMESPACE = "@eeacms"
         SONARQUBE_TAGS = "volto.eea.europa.eu"
-        DEPENDENCIES = "@eeacms/volto-blocks-form"
     }
 
   stages {
@@ -16,19 +15,19 @@ pipeline {
 
           "ES lint": {
             node(label: 'docker') {
-              sh '''docker run -i --rm --name="$BUILD_TAG-eslint" -e NAMESPACE="$NAMESPACE" -e DEPENDENCIES="$DEPENDENCIES" -e GIT_NAME=$GIT_NAME -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" plone/volto-addon-ci eslint'''
+              sh '''docker run -i --rm --name="$BUILD_TAG-eslint" -e NAMESPACE="$NAMESPACE" -e GIT_NAME=$GIT_NAME -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" plone/volto-addon-ci eslint'''
             }
           },
 
           "Style lint": {
             node(label: 'docker') {
-              sh '''docker run -i --rm --name="$BUILD_TAG-stylelint" -e NAMESPACE="$NAMESPACE" -e DEPENDENCIES="$DEPENDENCIES" -e GIT_NAME=$GIT_NAME -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" plone/volto-addon-ci stylelint'''
+              sh '''docker run -i --rm --name="$BUILD_TAG-stylelint" -e NAMESPACE="$NAMESPACE" -e GIT_NAME=$GIT_NAME -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" plone/volto-addon-ci stylelint'''
             }
           },
 
           "Prettier": {
             node(label: 'docker') {
-              sh '''docker run -i --rm --name="$BUILD_TAG-prettier" -e NAMESPACE="$NAMESPACE" -e DEPENDENCIES="$DEPENDENCIES" -e GIT_NAME=$GIT_NAME -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" plone/volto-addon-ci prettier'''
+              sh '''docker run -i --rm --name="$BUILD_TAG-prettier" -e NAMESPACE="$NAMESPACE" -e GIT_NAME=$GIT_NAME -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" plone/volto-addon-ci prettier'''
             }
           }
         )
@@ -44,7 +43,7 @@ pipeline {
               script {
                 try {
                   sh '''docker pull plone/volto-addon-ci'''
-                  sh '''docker run -i --name="$BUILD_TAG-volto" -e NAMESPACE="$NAMESPACE" -e DEPENDENCIES="$DEPENDENCIES" -e GIT_NAME=$GIT_NAME -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" plone/volto-addon-ci'''
+                  sh '''docker run -i --name="$BUILD_TAG-volto" -e NAMESPACE="$NAMESPACE" -e GIT_NAME=$GIT_NAME -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" plone/volto-addon-ci'''
                   sh '''mkdir -p xunit-reports'''
                   sh '''docker cp $BUILD_TAG-volto:/opt/frontend/my-volto-project/coverage xunit-reports/'''
                   sh '''docker cp $BUILD_TAG-volto:/opt/frontend/my-volto-project/junit.xml xunit-reports/'''
@@ -80,7 +79,7 @@ pipeline {
               script {
                 try {
                   sh '''docker pull plone; docker run -d --name="$BUILD_TAG-plone" -e SITE="Plone" -e PROFILES="profile-plone.restapi:blocks" plone fg'''
-                  sh '''docker pull plone/volto-addon-ci; docker run -i --name="$BUILD_TAG-cypress" --link $BUILD_TAG-plone:plone -e NAMESPACE="$NAMESPACE" -e DEPENDENCIES="$DEPENDENCIES" -e GIT_NAME=$GIT_NAME -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" plone/volto-addon-ci cypress'''
+                  sh '''docker pull plone/volto-addon-ci; docker run -i --name="$BUILD_TAG-cypress" --link $BUILD_TAG-plone:plone -e NAMESPACE="$NAMESPACE" -e GIT_NAME=$GIT_NAME -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" plone/volto-addon-ci cypress'''
                 } finally {
                   sh '''mkdir -p cypress-reports'''
                   sh '''docker cp $BUILD_TAG-cypress:/opt/frontend/my-volto-project/src/addons/$GIT_NAME/cypress/videos cypress-reports/'''

diff --git a/README.md b/README.md
@@ -26,7 +26,6 @@ blocks container.
    $ npm install -g yo @plone/generator-volto
    $ yo @plone/volto \
         my-volto-project \
-        --addon @eeacms/volto-blocks-form \
         --addon @eeacms/volto-columns-block \
         --no-interactive \
         --skip-install
@@ -39,7 +38,6 @@ blocks container.
 
    ```JSON
    "addons": [
-      "@eeacms/volto-blocks-form",
       "@eeacms/volto-columns-block"
    ],
 

diff --git a/package.json b/package.json
@@ -15,7 +15,6 @@
     "react"
   ],
   "dependencies": {
-    "@eeacms/volto-blocks-form": "^2.0.0",
     "react-color": "~2.18.1"
   },
   "repository": {

diff --git a/src/ColumnsBlock/ColumnsBlockEdit.jsx b/src/ColumnsBlock/ColumnsBlockEdit.jsx
@@ -3,10 +3,10 @@ import { Grid, Segment } from 'semantic-ui-react';
 import { isEmpty } from 'lodash';
 import { SidebarPortal, Icon } from '@plone/volto/components'; // BlocksForm, Icon,
 import InlineForm from '@plone/volto/components/manage/Form/InlineForm';
-import { emptyBlocksForm } from '@eeacms/volto-blocks-form/helpers';
+import { emptyBlocksForm } from '@plone/volto/helpers';
 import { setSidebarTab } from '@plone/volto/actions';
 import { connect } from 'react-redux';
-import { BlocksForm } from '@eeacms/volto-blocks-form/components';
+import { BlocksForm } from '@plone/volto/components';
 import { Button } from 'semantic-ui-react';
 import config from '@plone/volto/registry';
 

diff --git a/src/ColumnsBlock/ColumnsBlockView.jsx b/src/ColumnsBlock/ColumnsBlockView.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { Grid } from 'semantic-ui-react';
-import { RenderBlocks } from '@eeacms/volto-blocks-form/components';
+import { RenderBlocks } from '@plone/volto/components';
 import config from '@plone/volto/registry';
 import { COLUMNSBLOCK } from '@eeacms/volto-columns-block/constants';
 

diff --git a/src/ColumnsBlock/utils.js b/src/ColumnsBlock/utils.js
@@ -1,5 +1,5 @@
 import { v4 as uuid } from 'uuid';
-import { emptyBlocksForm } from '@eeacms/volto-blocks-form/helpers';
+import { emptyBlocksForm } from '@plone/volto/helpers';
 import config from '@plone/volto/registry';
 
 export const getColumns = (data) => {

diff --git a/src/Widgets/ColumnsWidget.jsx b/src/Widgets/ColumnsWidget.jsx
@@ -3,8 +3,8 @@ import { v4 as uuid } from 'uuid';
 import { omit, without } from 'lodash';
 import move from 'lodash-move';
 import { Icon, FormFieldWrapper } from '@plone/volto/components';
-import { DragDropList } from '@eeacms/volto-blocks-form/components';
-import { emptyBlocksForm } from '@eeacms/volto-blocks-form/helpers';
+import { DragDropList } from '@plone/volto/components';
+import { emptyBlocksForm } from '@plone/volto/helpers';
 
 import dragSVG from '@plone/volto/icons/drag.svg';
 import trashSVG from '@plone/volto/icons/delete.svg';