@plone/volto 18.1.2 → 18.2.1

package/src/components/manage/Controlpanels/Relations/RelationsMatrix.jsx

@@ -1,5 +1,6 @@
 import React, { useEffect, useState } from 'react';
-import { capitalize, find } from 'lodash';
+import capitalize from 'lodash/capitalize';
+import find from 'lodash/find';
 import { compose } from 'redux';
 import { useSelector, useDispatch } from 'react-redux';
 import { FormattedMessage, useIntl } from 'react-intl';
@@ -15,13 +16,14 @@ import {
   Tab,
 } from 'semantic-ui-react';
 import withObjectBrowser from '@plone/volto/components/manage/Sidebar/ObjectBrowser';
-import { messages } from '@plone/volto/helpers';
-import { Icon, Toast } from '@plone/volto/components';
+import { messages } from '@plone/volto/helpers/MessageLabels/MessageLabels';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
+import Toast from '@plone/volto/components/manage/Toast/Toast';
 import {
   getRelationStats,
   queryRelations,
-  rebuildRelations,
-} from '@plone/volto/actions';
+} from '@plone/volto/actions/relations/relations';
+import { rebuildRelations } from '@plone/volto/actions/relations/rebuild';
 import RelationsListing from '@plone/volto/components/manage/Controlpanels/Relations/RelationsListing';
 import BrokenRelations from '@plone/volto/components/manage/Controlpanels/Relations/BrokenRelations';
 import helpSVG from '@plone/volto/icons/help.svg';

package/src/components/manage/Controlpanels/Rules/AddRule.jsx

@@ -8,7 +8,8 @@ import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 import { compose } from 'redux';
 import { Link } from 'react-router-dom';
-import { getBaseUrl, getParentUrl, Helmet } from '@plone/volto/helpers';
+import { getBaseUrl, getParentUrl } from '@plone/volto/helpers/Url/Url';
+import Helmet from '@plone/volto/helpers/Helmet/Helmet';
 import { createPortal } from 'react-dom';
 import {
   Button,
@@ -19,11 +20,16 @@ import {
   Segment,
 } from 'semantic-ui-react';
 import { FormattedMessage, defineMessages, injectIntl } from 'react-intl';
-import { Icon, Toolbar, Toast } from '@plone/volto/components';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
+import Toolbar from '@plone/volto/components/manage/Toolbar/Toolbar';
+import Toast from '@plone/volto/components/manage/Toast/Toast';
 import { Field } from '@plone/volto/components/manage/Form';
 import { toast } from 'react-toastify';
 
-import { getContentRulesEvents, addNewRule } from '@plone/volto/actions';
+import {
+  getContentRulesEvents,
+  addNewRule,
+} from '@plone/volto/actions/rules/rules';
 
 import backSVG from '@plone/volto/icons/back.svg';
 

package/src/components/manage/Controlpanels/Rules/ConfigureRule.jsx

@@ -8,7 +8,8 @@ import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 import { compose } from 'redux';
 import { Link } from 'react-router-dom';
-import { getBaseUrl, getParentUrl, Helmet } from '@plone/volto/helpers';
+import { getBaseUrl, getParentUrl } from '@plone/volto/helpers/Url/Url';
+import Helmet from '@plone/volto/helpers/Helmet/Helmet';
 import { createPortal } from 'react-dom';
 import {
   Button,
@@ -19,7 +20,9 @@ import {
   Segment,
 } from 'semantic-ui-react';
 import { FormattedMessage, defineMessages, injectIntl } from 'react-intl';
-import { Icon, Toolbar, UniversalLink } from '@plone/volto/components';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
+import Toolbar from '@plone/volto/components/manage/Toolbar/Toolbar';
+import UniversalLink from '@plone/volto/components/manage/UniversalLink/UniversalLink';
 import {
   getControlPanelRule,
   removeCondition,
@@ -32,9 +35,9 @@ import {
   getAction,
   moveRuleCondition,
   moveRuleAction,
-} from '@plone/volto/actions';
+} from '@plone/volto/actions/rules/rules';
 import { toast } from 'react-toastify';
-import { Toast } from '@plone/volto/components';
+import Toast from '@plone/volto/components/manage/Toast/Toast';
 
 import backSVG from '@plone/volto/icons/back.svg';
 import upSVG from '@plone/volto/icons/up.svg';

package/src/components/manage/Controlpanels/Rules/EditRule.jsx

@@ -8,7 +8,8 @@ import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 import { compose } from 'redux';
 import { Link } from 'react-router-dom';
-import { getParentUrl, Helmet, getBaseUrl } from '@plone/volto/helpers';
+import { getParentUrl, getBaseUrl } from '@plone/volto/helpers/Url/Url';
+import Helmet from '@plone/volto/helpers/Helmet/Helmet';
 import { createPortal } from 'react-dom';
 import {
   Button,
@@ -20,13 +21,15 @@ import {
 } from 'semantic-ui-react';
 import { FormattedMessage, defineMessages, injectIntl } from 'react-intl';
 
-import { Icon, Toolbar, Toast } from '@plone/volto/components';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
+import Toolbar from '@plone/volto/components/manage/Toolbar/Toolbar';
+import Toast from '@plone/volto/components/manage/Toast/Toast';
 import { Field } from '@plone/volto/components/manage/Form';
 import {
   getControlPanelRule,
   editRule,
   getContentRulesEvents,
-} from '@plone/volto/actions';
+} from '@plone/volto/actions/rules/rules';
 import { toast } from 'react-toastify';
 
 import backSVG from '@plone/volto/icons/back.svg';

package/src/components/manage/Controlpanels/Rules/Rules.jsx

@@ -8,7 +8,8 @@ import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 import { compose } from 'redux';
 import { Link } from 'react-router-dom';
-import { getBaseUrl, getParentUrl, Helmet } from '@plone/volto/helpers';
+import Helmet from '@plone/volto/helpers/Helmet/Helmet';
+import { getBaseUrl, getParentUrl } from '@plone/volto/helpers/Url/Url';
 import { createPortal } from 'react-dom';
 import {
   Button,
@@ -20,16 +21,17 @@ import {
   Table,
 } from 'semantic-ui-react';
 import { FormattedMessage, defineMessages, injectIntl } from 'react-intl';
-import { Icon, Toolbar } from '@plone/volto/components';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
+import Toolbar from '@plone/volto/components/manage/Toolbar/Toolbar';
 import { toast } from 'react-toastify';
-import { Toast } from '@plone/volto/components';
+import Toast from '@plone/volto/components/manage/Toast/Toast';
 
 import {
   getControlPanelRules,
   deleteControlPanelRule,
   getContentRulesEvents,
   editRule,
-} from '@plone/volto/actions';
+} from '@plone/volto/actions/rules/rules';
 
 import backSVG from '@plone/volto/icons/back.svg';
 

package/src/components/manage/Controlpanels/Rules/components/VariableModal.jsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { Modal } from 'semantic-ui-react';
 import { connect } from 'react-redux';
 
-import { getVocabulary } from '@plone/volto/actions';
+import { getVocabulary } from '@plone/volto/actions/vocabularies/vocabularies';
 import { injectIntl } from 'react-intl';
 import { compose } from 'redux';
 

package/src/components/manage/Controlpanels/UndoControlpanel.jsx

@@ -10,15 +10,20 @@ import { Link } from 'react-router-dom';
 import { createPortal } from 'react-dom';
 import { Container, Segment, Table, Menu, Input } from 'semantic-ui-react';
 import { FormattedMessage, defineMessages, injectIntl } from 'react-intl';
-import { Icon, Toolbar, Toast } from '@plone/volto/components';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
+import Toolbar from '@plone/volto/components/manage/Toolbar/Toolbar';
+import Toast from '@plone/volto/components/manage/Toast/Toast';
 import { Form } from '@plone/volto/components/manage/Form';
 import backSVG from '@plone/volto/icons/back.svg';
-import { map } from 'lodash';
-import { Helmet } from '@plone/volto/helpers';
+import map from 'lodash/map';
+import Helmet from '@plone/volto/helpers/Helmet/Helmet';
 import nextIcon from '@plone/volto/icons/right-key.svg';
 import prevIcon from '@plone/volto/icons/left-key.svg';
 import undoSVG from '@plone/volto/icons/undo.svg';
-import { getTransactions, revertTransactions } from '@plone/volto/actions';
+import {
+  getTransactions,
+  revertTransactions,
+} from '@plone/volto/actions/transactions/transactions';
 import { toast } from 'react-toastify';
 
 const messages = defineMessages({

package/src/components/manage/Controlpanels/UpgradeControlPanel.jsx

@@ -17,15 +17,17 @@ import {
   Table,
 } from 'semantic-ui-react';
 import { FormattedMessage, defineMessages, injectIntl } from 'react-intl';
-import { map } from 'lodash';
+import map from 'lodash/map';
 
+import { getSystemInformation } from '@plone/volto/actions/controlpanels/controlpanels';
 import {
-  getSystemInformation,
   getUpgradeInformation,
   runUpgrade,
-} from '@plone/volto/actions';
-import { Helmet } from '@plone/volto/helpers';
-import { Icon, Toast, Toolbar } from '@plone/volto/components';
+} from '@plone/volto/actions/upgrade/upgrade';
+import Helmet from '@plone/volto/helpers/Helmet/Helmet';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
+import Toast from '@plone/volto/components/manage/Toast/Toast';
+import Toolbar from '@plone/volto/components/manage/Toolbar/Toolbar';
 import { VersionOverview } from '@plone/volto/components/manage/Controlpanels';
 import backSVG from '@plone/volto/icons/back.svg';
 import { toast } from 'react-toastify';

package/src/components/manage/Controlpanels/Users/RenderUsers.jsx

@@ -8,13 +8,15 @@ import { FormattedMessage, injectIntl } from 'react-intl';
 import { Dropdown, Table, Checkbox } from 'semantic-ui-react';
 import trashSVG from '@plone/volto/icons/delete.svg';
 import editSVG from '@plone/volto/icons/editing.svg';
-import { Icon, Toast } from '@plone/volto/components';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
+import Toast from '@plone/volto/components/manage/Toast/Toast';
 import { ModalForm } from '@plone/volto/components/manage/Form';
-import { updateUser } from '@plone/volto/actions';
+import { updateUser } from '@plone/volto/actions/users/users';
 import ploneSVG from '@plone/volto/icons/plone.svg';
 import { compose } from 'redux';
 import { connect } from 'react-redux';
-import { messages, canAssignRole } from '@plone/volto/helpers';
+import { messages } from '@plone/volto/helpers/MessageLabels/MessageLabels';
+import { canAssignRole } from '@plone/volto/helpers/User/User';
 import { toast } from 'react-toastify';
 
 /**

package/src/components/manage/Controlpanels/Users/UserGroupMembershipControlPanel.jsx

@@ -3,21 +3,24 @@
  * TODO Enrich with features of user control panel. Then replace user control panel.
  */
 import React, { useEffect, useState } from 'react';
-import { find } from 'lodash';
+import find from 'lodash/find';
 import { createPortal } from 'react-dom';
 import { useHistory } from 'react-router';
 import { Link, useLocation } from 'react-router-dom';
 import { FormattedMessage, useIntl } from 'react-intl';
 import { useDispatch, useSelector } from 'react-redux';
 import { Segment } from 'semantic-ui-react';
-import { Helmet, messages } from '@plone/volto/helpers';
+import Helmet from '@plone/volto/helpers/Helmet/Helmet';
+import { messages } from '@plone/volto/helpers/MessageLabels/MessageLabels';
 import {
   getControlpanel,
   getSystemInformation,
-  listActions,
-} from '@plone/volto/actions';
-import { Icon, Toolbar, Unauthorized } from '@plone/volto/components';
-import { getParentUrl } from '@plone/volto/helpers';
+} from '@plone/volto/actions/controlpanels/controlpanels';
+import { listActions } from '@plone/volto/actions/actions/actions';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
+import Toolbar from '@plone/volto/components/manage/Toolbar/Toolbar';
+import Unauthorized from '@plone/volto/components/theme/Unauthorized/Unauthorized';
+import { getParentUrl } from '@plone/volto/helpers/Url/Url';
 import UserGroupMembershipMatrix from '@plone/volto/components/manage/Controlpanels/Users/UserGroupMembershipMatrix';
 import backSVG from '@plone/volto/icons/back.svg';
 import settingsSVG from '@plone/volto/icons/settings.svg';

package/src/components/manage/Controlpanels/Users/UserGroupMembershipListing.jsx

@@ -1,14 +1,18 @@
 import React, { useEffect, useState, useMemo } from 'react';
-import { cloneDeep, uniqBy, debounce } from 'lodash';
+import cloneDeep from 'lodash/cloneDeep';
+import uniqBy from 'lodash/uniqBy';
+import debounce from 'lodash/debounce';
 import { useIntl } from 'react-intl';
 import { useSelector, useDispatch, shallowEqual } from 'react-redux';
 import jwtDecode from 'jwt-decode';
 import { toast } from 'react-toastify';
 import { Button, Checkbox } from 'semantic-ui-react';
-import { messages, isManager, canAssignGroup } from '@plone/volto/helpers';
-import { listGroups, getUser } from '@plone/volto/actions';
-import { Icon, Toast } from '@plone/volto/components';
-import { updateGroup, listUsers } from '@plone/volto/actions';
+import { messages } from '@plone/volto/helpers/MessageLabels/MessageLabels';
+import { isManager, canAssignGroup } from '@plone/volto/helpers/User/User';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
+import Toast from '@plone/volto/components/manage/Toast/Toast';
+import { listGroups, updateGroup } from '@plone/volto/actions/groups/groups';
+import { getUser, listUsers } from '@plone/volto/actions/users/users';
 
 import down_key from '@plone/volto/icons/down-key.svg';
 

package/src/components/manage/Controlpanels/Users/UserGroupMembershipMatrix.jsx

@@ -3,10 +3,11 @@ import { useSelector, useDispatch } from 'react-redux';
 import { useIntl } from 'react-intl';
 import { Checkbox, Form, Input } from 'semantic-ui-react';
 
-import { isEqual, debounce } from 'lodash';
+import isEqual from 'lodash/isEqual';
+import debounce from 'lodash/debounce';
 
-import { messages } from '@plone/volto/helpers';
-import { listGroups } from '@plone/volto/actions'; // getRegistry
+import { messages } from '@plone/volto/helpers/MessageLabels/MessageLabels';
+import { listGroups } from '@plone/volto/actions/groups/groups'; // getRegistry
 import UserGroupMembershipListing from '@plone/volto/components/manage/Controlpanels/Users/UserGroupMembershipListing';
 
 const UserGroupMembershipMatrix = ({ many_users, many_groups }) => {

package/src/components/manage/Controlpanels/Users/UsersControlpanel.jsx

@@ -5,37 +5,34 @@
 import {
   createUser,
   deleteUser,
-  listRoles,
-  listGroups,
   listUsers,
-  getControlpanel,
   updateUser,
-  updateGroup,
-  getUserSchema,
   getUser,
-} from '@plone/volto/actions';
+} from '@plone/volto/actions/users/users';
+import { listRoles } from '@plone/volto/actions/roles/roles';
+import { listGroups, updateGroup } from '@plone/volto/actions/groups/groups';
+import { getControlpanel } from '@plone/volto/actions/controlpanels/controlpanels';
+import { getUserSchema } from '@plone/volto/actions/userschema/userschema';
 import jwtDecode from 'jwt-decode';
-import {
-  Icon,
-  Toast,
-  Toolbar,
-  Pagination,
-  Error,
-} from '@plone/volto/components';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
+import Toast from '@plone/volto/components/manage/Toast/Toast';
+import Toolbar from '@plone/volto/components/manage/Toolbar/Toolbar';
+import Pagination from '@plone/volto/components/theme/Pagination/Pagination';
+import Error from '@plone/volto/components/theme/Error/Error';
 import { ModalForm } from '@plone/volto/components/manage/Form';
 import RenderUsers from '@plone/volto/components/manage/Controlpanels/Users/RenderUsers';
 import { Link } from 'react-router-dom';
-import {
-  Helmet,
-  messages,
-  isManager,
-  canAssignGroup,
-} from '@plone/volto/helpers';
+import Helmet from '@plone/volto/helpers/Helmet/Helmet';
+import { messages } from '@plone/volto/helpers/MessageLabels/MessageLabels';
+import { isManager, canAssignGroup } from '@plone/volto/helpers/User/User';
 import clearSVG from '@plone/volto/icons/clear.svg';
 import addUserSvg from '@plone/volto/icons/add-user.svg';
 import saveSVG from '@plone/volto/icons/save.svg';
 import ploneSVG from '@plone/volto/icons/plone.svg';
-import { find, map, pull, difference } from 'lodash';
+import find from 'lodash/find';
+import map from 'lodash/map';
+import pull from 'lodash/pull';
+import difference from 'lodash/difference';
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import { FormattedMessage, injectIntl } from 'react-intl';

package/src/components/manage/Controlpanels/VersionOverview.jsx

@@ -5,7 +5,7 @@
 
 import React from 'react';
 import { FormattedMessage } from 'react-intl';
-import { isEmpty } from 'lodash';
+import isEmpty from 'lodash/isEmpty';
 
 import voltoPackageJson from '../../../../package.json';
 import projectPackageJson from '@root/../package.json';

package/src/components/manage/Controlpanels/index.tsx

@@ -1,6 +1,9 @@
 import loadable from '@loadable/component';
-import { getSystemInformation, listControlpanels } from '@plone/volto/actions';
-import { asyncConnect } from '@plone/volto/helpers';
+import {
+  getSystemInformation,
+  listControlpanels,
+} from '@plone/volto/actions/controlpanels/controlpanels';
+import { asyncConnect } from '@plone/volto/helpers/AsyncConnect';
 
 // CONTROLPANELS
 

package/src/components/manage/Delete/Delete.jsx

@@ -6,9 +6,13 @@ import { Button, Container, List, Segment } from 'semantic-ui-react';
 import { FormattedMessage, defineMessages, useIntl } from 'react-intl';
 import qs from 'query-string';
 
-import { Toolbar } from '@plone/volto/components';
-import { Helmet, usePrevious } from '@plone/volto/helpers';
-import { deleteContent, getContent } from '@plone/volto/actions';
+import Toolbar from '@plone/volto/components/manage/Toolbar/Toolbar';
+import Helmet from '@plone/volto/helpers/Helmet/Helmet';
+import { usePrevious } from '@plone/volto/helpers/Utils/usePrevious';
+import {
+  deleteContent,
+  getContent,
+} from '@plone/volto/actions/content/content';
 
 const messages = defineMessages({
   delete: {

package/src/components/manage/Diff/Diff.jsx

@@ -5,29 +5,31 @@
 
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import { Helmet } from '@plone/volto/helpers';
+import Helmet from '@plone/volto/helpers/Helmet/Helmet';
 import { connect } from 'react-redux';
 import { compose } from 'redux';
-import { filter, isEqual, map } from 'lodash';
+import filter from 'lodash/filter';
+import isEqual from 'lodash/isEqual';
+import map from 'lodash/map';
 import { Container, Button, Dropdown, Grid, Table } from 'semantic-ui-react';
 import { Link, withRouter } from 'react-router-dom';
 import { createPortal } from 'react-dom';
 import { FormattedMessage, defineMessages, injectIntl } from 'react-intl';
 import qs from 'query-string';
 
-import { getDiff, getSchema, getHistory } from '@plone/volto/actions';
+import { getDiff } from '@plone/volto/actions/diff/diff';
+import { getSchema } from '@plone/volto/actions/schema/schema';
+import { getHistory } from '@plone/volto/actions/history/history';
+import { getBaseUrl } from '@plone/volto/helpers/Url/Url';
 import {
-  getBaseUrl,
   getBlocksFieldname,
   getBlocksLayoutFieldname,
   hasBlocksData,
-} from '@plone/volto/helpers';
-import {
-  FormattedDate,
-  Icon,
-  Toolbar,
-  Unauthorized,
-} from '@plone/volto/components';
+} from '@plone/volto/helpers/Blocks/Blocks';
+import FormattedDate from '@plone/volto/components/theme/FormattedDate/FormattedDate';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
+import Toolbar from '@plone/volto/components/manage/Toolbar/Toolbar';
+import Unauthorized from '@plone/volto/components/theme/Unauthorized/Unauthorized';
 import DiffField from '@plone/volto/components/manage/Diff/DiffField';
 
 import backSVG from '@plone/volto/icons/back.svg';

package/src/components/manage/Diff/DiffField.jsx

@@ -4,7 +4,8 @@
  */
 
 import React from 'react';
-import { join, map } from 'lodash';
+import join from 'lodash/join';
+import map from 'lodash/map';
 import PropTypes from 'prop-types';
 import { Grid } from 'semantic-ui-react';
 import ReactDOMServer from 'react-dom/server';
@@ -13,9 +14,9 @@ import { createBrowserHistory } from 'history';
 import { ConnectedRouter } from 'connected-react-router';
 import { useSelector } from 'react-redux';
 import config from '@plone/volto/registry';
-import { Api } from '@plone/volto/helpers';
+import Api from '@plone/volto/helpers/Api/Api';
 import configureStore from '@plone/volto/store';
-import { RenderBlocks } from '@plone/volto/components';
+import RenderBlocks from '@plone/volto/components/theme/View/RenderBlocks';
 import { serializeNodes } from '@plone/volto-slate/editor/render';
 import { injectLazyLibs } from '@plone/volto/helpers/Loadable/Loadable';
 

package/src/components/manage/Display/Display.jsx

@@ -4,10 +4,15 @@ import { useDispatch, useSelector } from 'react-redux';
 import { compose } from 'redux';
 import { injectLazyLibs } from '@plone/volto/helpers/Loadable/Loadable';
 
-import { getSchema, updateContent, getContent } from '@plone/volto/actions';
-import { getLayoutFieldname } from '@plone/volto/helpers';
-import { usePrevious } from '@plone/volto/helpers';
-import { FormFieldWrapper, Icon } from '@plone/volto/components';
+import { getSchema } from '@plone/volto/actions/schema/schema';
+import {
+  updateContent,
+  getContent,
+} from '@plone/volto/actions/content/content';
+import { getLayoutFieldname } from '@plone/volto/helpers/Content/Content';
+import { usePrevious } from '@plone/volto/helpers/Utils/usePrevious';
+import { FormFieldWrapper } from '@plone/volto/components/manage/Widgets';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
 import { defineMessages, useIntl } from 'react-intl';
 import config from '@plone/volto/registry';
 

package/src/components/manage/DragDropList/DragDropList.jsx

@@ -1,5 +1,5 @@
 import React, { useRef } from 'react';
-import { isEmpty } from 'lodash';
+import isEmpty from 'lodash/isEmpty';
 import { injectLazyLibs } from '@plone/volto/helpers/Loadable/Loadable';
 import { v4 as uuid } from 'uuid';
 

package/src/components/manage/Edit/Edit.jsx

@@ -5,44 +5,41 @@
 
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import { Helmet, extractInvariantErrors } from '@plone/volto/helpers';
+import Helmet from '@plone/volto/helpers/Helmet/Helmet';
+import { extractInvariantErrors } from '@plone/volto/helpers/FormValidation/FormValidation';
 import { connect } from 'react-redux';
 import { compose } from 'redux';
-import { asyncConnect, hasApiExpander } from '@plone/volto/helpers';
+import { asyncConnect } from '@plone/volto/helpers/AsyncConnect';
+import { hasApiExpander } from '@plone/volto/helpers/Utils/Utils';
 import { defineMessages, injectIntl } from 'react-intl';
 import { Button, Grid, Menu } from 'semantic-ui-react';
 import { createPortal } from 'react-dom';
 import qs from 'query-string';
-import { find } from 'lodash';
+import find from 'lodash/find';
 import { toast } from 'react-toastify';
 
-import {
-  Forbidden,
-  Icon,
-  Sidebar,
-  Toast,
-  Toolbar,
-  Unauthorized,
-  CompareLanguages,
-  TranslationObject,
-} from '@plone/volto/components';
+import Forbidden from '@plone/volto/components/theme/Forbidden/Forbidden';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
+import Sidebar from '@plone/volto/components/manage/Sidebar/Sidebar';
+import Toast from '@plone/volto/components/manage/Toast/Toast';
+import Toolbar from '@plone/volto/components/manage/Toolbar/Toolbar';
+import Unauthorized from '@plone/volto/components/theme/Unauthorized/Unauthorized';
+import CompareLanguages from '@plone/volto/components/manage/Multilingual/CompareLanguages';
+import TranslationObject from '@plone/volto/components/manage/Multilingual/TranslationObject';
 import { Form } from '@plone/volto/components/manage/Form';
 import {
   updateContent,
   getContent,
   lockContent,
   unlockContent,
-  getSchema,
-  listActions,
-  setFormData,
-} from '@plone/volto/actions';
-import {
-  flattenToAppURL,
-  getBaseUrl,
-  hasBlocksData,
-} from '@plone/volto/helpers';
+} from '@plone/volto/actions/content/content';
+import { getSchema } from '@plone/volto/actions/schema/schema';
+import { listActions } from '@plone/volto/actions/actions/actions';
+import { setFormData } from '@plone/volto/actions/form/form';
+import { flattenToAppURL, getBaseUrl } from '@plone/volto/helpers/Url/Url';
+import { hasBlocksData } from '@plone/volto/helpers/Blocks/Blocks';
 import { preloadLazyLibs } from '@plone/volto/helpers/Loadable';
-import { tryParseJSON } from '@plone/volto/helpers';
+import { tryParseJSON } from '@plone/volto/helpers/FormValidation/FormValidation';
 
 import saveSVG from '@plone/volto/icons/save.svg';
 import clearSVG from '@plone/volto/icons/clear.svg';

package/src/components/manage/Form/BlockDataForm.jsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { InlineForm } from '@plone/volto/components/manage/Form';
-import { withVariationSchemaEnhancer } from '@plone/volto/helpers';
+import { withVariationSchemaEnhancer } from '@plone/volto/helpers/Extensions';
 
 const EnhancedBlockDataForm = withVariationSchemaEnhancer(InlineForm);
 

package/src/components/manage/Form/BlocksToolbar.jsx

@@ -2,18 +2,23 @@ import React from 'react';
 import { compose } from 'redux';
 import { connect } from 'react-redux';
 import { injectIntl } from 'react-intl';
+import { messages } from '@plone/volto/helpers/MessageLabels/MessageLabels';
 import {
-  messages,
   getBlocksFieldname,
   getBlocksLayoutFieldname,
-} from '@plone/volto/helpers';
-import { Icon } from '@plone/volto/components';
+} from '@plone/volto/helpers/Blocks/Blocks';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
 import { Plug } from '@plone/volto/components/manage/Pluggable';
 import { v4 as uuid } from 'uuid';
 import { load } from 'redux-localstorage-simple';
-import { isEqual, omit, without } from 'lodash';
+import isEqual from 'lodash/isEqual';
+import omit from 'lodash/omit';
+import without from 'lodash/without';
 
-import { setBlocksClipboard, resetBlocksClipboard } from '@plone/volto/actions';
+import {
+  setBlocksClipboard,
+  resetBlocksClipboard,
+} from '@plone/volto/actions/blocksClipboard/blocksClipboard';
 import config from '@plone/volto/registry';
 
 import copySVG from '@plone/volto/icons/copy.svg';