@plone/volto 18.1.1 → 18.2.0

package/src/components/manage/Blocks/Search/widgets/SelectMetadataField.jsx

@@ -3,7 +3,10 @@
  * @module components/manage/Widgets/SelectWidget
  */
 
-import { map, filter, toPairs, groupBy } from 'lodash';
+import map from 'lodash/map';
+import filter from 'lodash/filter';
+import toPairs from 'lodash/toPairs';
+import groupBy from 'lodash/groupBy';
 import { useEffect } from 'react';
 import PropTypes from 'prop-types';
 import { injectLazyLibs } from '@plone/volto/helpers/Loadable/Loadable';

package/src/components/manage/Blocks/Teaser/Data.jsx

@@ -3,14 +3,13 @@ import { useDispatch } from 'react-redux';
 import { defineMessages, useIntl } from 'react-intl';
 import { Button } from 'semantic-ui-react';
 import { toast } from 'react-toastify';
-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 { BlockDataForm } from '@plone/volto/components/manage/Form';
-import {
-  flattenToAppURL,
-  messages as defaultMessages,
-} from '@plone/volto/helpers';
-import { getContent } from '@plone/volto/actions';
-import { isEmpty } from 'lodash';
+import { flattenToAppURL } from '@plone/volto/helpers/Url/Url';
+import { messages as defaultMessages } from '@plone/volto/helpers/MessageLabels/MessageLabels';
+import { getContent } from '@plone/volto/actions/content/content';
+import isEmpty from 'lodash/isEmpty';
 
 import reloadSVG from '@plone/volto/icons/reload.svg';
 import trashSVG from '@plone/volto/icons/delete.svg';

package/src/components/manage/Blocks/Teaser/DefaultBody.jsx

@@ -3,9 +3,9 @@ import PropTypes from 'prop-types';
 import { Message } from 'semantic-ui-react';
 import { defineMessages, useIntl } from 'react-intl';
 import imageBlockSVG from '@plone/volto/components/manage/Blocks/Image/block-image.svg';
-import { isInternalURL } from '@plone/volto/helpers';
-import { MaybeWrap } from '@plone/volto/components';
-import { UniversalLink } from '@plone/volto/components';
+import { isInternalURL } from '@plone/volto/helpers/Url/Url';
+import MaybeWrap from '@plone/volto/components/manage/MaybeWrap/MaybeWrap';
+import UniversalLink from '@plone/volto/components/manage/UniversalLink/UniversalLink';
 import cx from 'classnames';
 import config from '@plone/volto/registry';
 

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

@@ -1,8 +1,8 @@
 import React from 'react';
 import TeaserBody from './Body';
-import { SidebarPortal } from '@plone/volto/components';
+import SidebarPortal from '@plone/volto/components/manage/Sidebar/SidebarPortal';
 import TeaserData from './Data';
-import { withBlockExtensions } from '@plone/volto/helpers';
+import { withBlockExtensions } from '@plone/volto/helpers/Extensions';
 
 const TeaserEdit = (props) => {
   const { data, onChangeBlock, block, selected } = props;

package/src/components/manage/Blocks/Teaser/View.jsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import TeaserBody from './Body';
-import { withBlockExtensions } from '@plone/volto/helpers';
+import { withBlockExtensions } from '@plone/volto/helpers/Extensions';
 
 const TeaserView = (props) => {
   return <TeaserBody {...props} />;

package/src/components/manage/Blocks/Teaser/adapter.js

@@ -1,4 +1,4 @@
-import { isEmpty } from 'lodash';
+import isEmpty from 'lodash/isEmpty';
 
 export const TeaserBlockDataAdapter = ({
   block,

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

@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { SidebarPortal } from '@plone/volto/components';
+import SidebarPortal from '@plone/volto/components/manage/Sidebar/SidebarPortal';
 import { BlockDataForm } from '@plone/volto/components/manage/Form';
 
 import TableOfContentsSchema from './Schema';

package/src/components/manage/Blocks/ToC/View.jsx

@@ -8,12 +8,12 @@ import { FormattedMessage } from 'react-intl';
 import cx from 'classnames';
 import { Message } from 'semantic-ui-react';
 import config from '@plone/volto/registry';
-import { withBlockExtensions } from '@plone/volto/helpers';
+import { withBlockExtensions } from '@plone/volto/helpers/Extensions';
 
 import {
   getBlocksFieldname,
   getBlocksLayoutFieldname,
-} from '@plone/volto/helpers';
+} from '@plone/volto/helpers/Blocks/Blocks';
 
 export const getBlocksTocEntries = (properties, tocData) => {
   const blocksFieldName = getBlocksFieldname(properties);

package/src/components/manage/Blocks/ToC/variations/DefaultTocRenderer.jsx

@@ -4,11 +4,11 @@
  */
 
 import PropTypes from 'prop-types';
-import { map } from 'lodash';
+import map from 'lodash/map';
 import { List } from 'semantic-ui-react';
 import Slugger from 'github-slugger';
-import { UniversalLink } from '@plone/volto/components';
-import { normalizeString } from '@plone/volto/helpers';
+import UniversalLink from '@plone/volto/components/manage/UniversalLink/UniversalLink';
+import { normalizeString } from '@plone/volto/helpers/Utils/Utils';
 
 const RenderListItems = ({ items, data }) => {
   return map(items, (item) => {

package/src/components/manage/Blocks/ToC/variations/HorizontalMenu.jsx

@@ -1,10 +1,10 @@
 import React, { useEffect, useState } from 'react';
 import PropTypes from 'prop-types';
-import { map } from 'lodash';
+import map from 'lodash/map';
 import { Menu, Dropdown } from 'semantic-ui-react';
 import AnchorLink from 'react-anchor-link-smooth-scroll';
 import Slugger from 'github-slugger';
-import { normalizeString } from '@plone/volto/helpers';
+import { normalizeString } from '@plone/volto/helpers/Utils/Utils';
 
 const RenderMenuItems = ({ items }) => {
   return map(items, (item) => {

package/src/components/manage/Blocks/Video/Body.jsx

@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import { FormattedMessage } from 'react-intl';
 import { Embed, Message } from 'semantic-ui-react';
 import cx from 'classnames';
-import { isInternalURL, flattenToAppURL } from '@plone/volto/helpers';
+import { isInternalURL, flattenToAppURL } from '@plone/volto/helpers/Url/Url';
 
 //Extracting videoID, listID and thumbnailURL from the video URL
 const getVideoIDAndPlaceholder = (url) => {

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

@@ -4,12 +4,14 @@ import { defineMessages, useIntl } from 'react-intl';
 import { Button, Input, Message } from 'semantic-ui-react';
 import cx from 'classnames';
 
-import { Icon, SidebarPortal, VideoSidebar } from '@plone/volto/components';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
+import SidebarPortal from '@plone/volto/components/manage/Sidebar/SidebarPortal';
+import VideoSidebar from '@plone/volto/components/manage/Blocks/Video/VideoSidebar';
 import clearSVG from '@plone/volto/icons/clear.svg';
 import aheadSVG from '@plone/volto/icons/ahead.svg';
 import videoBlockSVG from '@plone/volto/components/manage/Blocks/Video/block-video.svg';
 import Body from '@plone/volto/components/manage/Blocks/Video/Body';
-import { withBlockExtensions } from '@plone/volto/helpers';
+import { withBlockExtensions } from '@plone/volto/helpers/Extensions';
 
 const messages = defineMessages({
   VideoFormDescription: {

package/src/components/manage/Blocks/Video/VideoSidebar.jsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { VideoBlockSchema } from './schema';
 import { Segment } from 'semantic-ui-react';
 import { defineMessages, useIntl } from 'react-intl';
-import { Icon } from '@plone/volto/components';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
 import { BlockDataForm } from '@plone/volto/components/manage/Form';
 import videoSVG from '@plone/volto/icons/videocamera.svg';
 

package/src/components/manage/Blocks/Video/View.jsx

@@ -6,7 +6,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import Body from '@plone/volto/components/manage/Blocks/Video/Body';
-import { withBlockExtensions } from '@plone/volto/helpers';
+import { withBlockExtensions } from '@plone/volto/helpers/Extensions';
 import cx from 'classnames';
 
 /**

package/src/components/manage/ConditionalLink/ConditionalLink.jsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { UniversalLink } from '@plone/volto/components';
+import UniversalLink from '@plone/volto/components/manage/UniversalLink/UniversalLink';
 import PropTypes from 'prop-types';
 
 const ConditionalLink = ({ condition, to, item, ...props }) => {

package/src/components/manage/Contents/Contents.jsx

@@ -22,44 +22,42 @@ import {
   Loader,
   Dimmer,
 } from 'semantic-ui-react';
-import {
-  concat,
-  filter,
-  find,
-  indexOf,
-  keys,
-  map,
-  mapValues,
-  pull,
-} from 'lodash';
+import concat from 'lodash/concat';
+import filter from 'lodash/filter';
+import find from 'lodash/find';
+import indexOf from 'lodash/indexOf';
+import keys from 'lodash/keys';
+import map from 'lodash/map';
+import mapValues from 'lodash/mapValues';
+import pull from 'lodash/pull';
 import move from 'lodash-move';
 import { FormattedMessage, defineMessages, injectIntl } from 'react-intl';
-import { asyncConnect } from '@plone/volto/helpers';
-import { flattenToAppURL } from '@plone/volto/helpers';
+import { asyncConnect } from '@plone/volto/helpers/AsyncConnect';
+import { flattenToAppURL, getBaseUrl } from '@plone/volto/helpers/Url/Url';
 
+import { searchContent } from '@plone/volto/actions/search/search';
 import {
-  searchContent,
-  cut,
-  copy,
-  copyContent,
   deleteContent,
-  listActions,
-  moveContent,
   orderContent,
   sortContent,
   updateColumnsContent,
   linkIntegrityCheck,
   getContent,
-} from '@plone/volto/actions';
-import Indexes, { defaultIndexes } from '@plone/volto/constants/Indexes';
+} from '@plone/volto/actions/content/content';
 import {
-  Pagination,
-  Popup,
-  Toolbar,
-  Toast,
-  Icon,
-  Unauthorized,
-} from '@plone/volto/components';
+  copyContent,
+  moveContent,
+  cut,
+  copy,
+} from '@plone/volto/actions/clipboard/clipboard';
+import { listActions } from '@plone/volto/actions/actions/actions';
+import Indexes, { defaultIndexes } from '@plone/volto/constants/Indexes';
+import Pagination from '@plone/volto/components/theme/Pagination/Pagination';
+import Popup from '@plone/volto/components/theme/Popup/Popup';
+import Toolbar from '@plone/volto/components/manage/Toolbar/Toolbar';
+import Toast from '@plone/volto/components/manage/Toast/Toast';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
+import Unauthorized from '@plone/volto/components/theme/Unauthorized/Unauthorized';
 import ContentsBreadcrumbs from '@plone/volto/components/manage/Contents/ContentsBreadcrumbs';
 import ContentsIndexHeader from '@plone/volto/components/manage/Contents/ContentsIndexHeader';
 import ContentsItem from '@plone/volto/components/manage/Contents/ContentsItem';
@@ -69,7 +67,7 @@ import ContentsWorkflowModal from '@plone/volto/components/manage/Contents/Conte
 import ContentsTagsModal from '@plone/volto/components/manage/Contents/ContentsTagsModal';
 import ContentsPropertiesModal from '@plone/volto/components/manage/Contents/ContentsPropertiesModal';
 
-import { Helmet, getBaseUrl } from '@plone/volto/helpers';
+import Helmet from '@plone/volto/helpers/Helmet/Helmet';
 import { injectLazyLibs } from '@plone/volto/helpers/Loadable/Loadable';
 import config from '@plone/volto/registry';
 

package/src/components/manage/Contents/ContentsBreadcrumbs.jsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { Breadcrumb } from 'semantic-ui-react';
 import { Link, useLocation } from 'react-router-dom';
 import { defineMessages, useIntl } from 'react-intl';
-import { langmap } from '@plone/volto/helpers';
+import langmap from '@plone/volto/helpers/LanguageMap/LanguageMap';
 import ContentsBreadcrumbsRootItem from '@plone/volto/components/manage/Contents/ContentsBreadcrumbsRootItem';
 import ContentsBreadcrumbsHomeItem from '@plone/volto/components/manage/Contents/ContentsBreadcrumbsHomeItem';
 

package/src/components/manage/Contents/ContentsItem.jsx

@@ -7,10 +7,13 @@ import React from 'react';
 import { Button, Table, Menu, Divider } from 'semantic-ui-react';
 import { Link } from 'react-router-dom';
 import PropTypes from 'prop-types';
-import { map } from 'lodash';
+import map from 'lodash/map';
 import { useIntl, defineMessages, FormattedMessage } from 'react-intl';
-import { Circle, FormattedDate, Icon, Popup } from '@plone/volto/components';
-import { getContentIcon } from '@plone/volto/helpers';
+import Circle from '@plone/volto/components/manage/Contents/circle';
+import FormattedDate from '@plone/volto/components/theme/FormattedDate/FormattedDate';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
+import Popup from '@plone/volto/components/theme/Popup/Popup';
+import { getContentIcon } from '@plone/volto/helpers/Content/Content';
 import moreSVG from '@plone/volto/icons/more.svg';
 import checkboxUncheckedSVG from '@plone/volto/icons/checkbox-unchecked.svg';
 import checkboxCheckedSVG from '@plone/volto/icons/checkbox-checked.svg';

package/src/components/manage/Contents/ContentsPropertiesModal.jsx

@@ -1,12 +1,13 @@
 import { useEffect } from 'react';
 import PropTypes from 'prop-types';
 import { useDispatch, useSelector } from 'react-redux';
-import { isEmpty, map } from 'lodash';
+import isEmpty from 'lodash/isEmpty';
+import map from 'lodash/map';
 import { defineMessages, useIntl } from 'react-intl';
 
-import { usePrevious } from '@plone/volto/helpers';
+import { usePrevious } from '@plone/volto/helpers/Utils/usePrevious';
 import { cloneDeepSchema } from '@plone/volto/helpers/Utils/Utils';
-import { updateContent } from '@plone/volto/actions';
+import { updateContent } from '@plone/volto/actions/content/content';
 import { ModalForm } from '@plone/volto/components/manage/Form';
 import config from '@plone/volto/registry';
 

package/src/components/manage/Contents/ContentsRenameModal.jsx

@@ -1,11 +1,13 @@
 import React, { useCallback, useEffect } from 'react';
 import PropTypes from 'prop-types';
 import { useDispatch, useSelector } from 'react-redux';
-import { concat, merge, map } from 'lodash';
+import concat from 'lodash/concat';
+import merge from 'lodash/merge';
+import map from 'lodash/map';
 import { defineMessages, useIntl } from 'react-intl';
 
-import { usePrevious } from '@plone/volto/helpers';
-import { updateContent } from '@plone/volto/actions';
+import { usePrevious } from '@plone/volto/helpers/Utils/usePrevious';
+import { updateContent } from '@plone/volto/actions/content/content';
 import { ModalForm } from '@plone/volto/components/manage/Form';
 
 const messages = defineMessages({

package/src/components/manage/Contents/ContentsTagsModal.jsx

@@ -1,11 +1,11 @@
 import React, { useCallback, useEffect, useMemo } from 'react';
 import PropTypes from 'prop-types';
 import { useDispatch, useSelector } from 'react-redux';
-import { map } from 'lodash';
+import map from 'lodash/map';
 import { defineMessages, useIntl } from 'react-intl';
 
-import { usePrevious } from '@plone/volto/helpers';
-import { updateContent } from '@plone/volto/actions';
+import { usePrevious } from '@plone/volto/helpers/Utils/usePrevious';
+import { updateContent } from '@plone/volto/actions/content/content';
 import { ModalForm } from '@plone/volto/components/manage/Form';
 
 const messages = defineMessages({

package/src/components/manage/Contents/ContentsUploadModal.jsx

@@ -14,13 +14,16 @@ import {
   Progress,
 } from 'semantic-ui-react';
 import loadable from '@loadable/component';
-import { concat, filter, map } from 'lodash';
+import concat from 'lodash/concat';
+import filter from 'lodash/filter';
+import map from 'lodash/map';
 import filesize from 'filesize';
 import { readAsDataURL } from 'promise-file-reader';
 import { FormattedMessage, defineMessages, useIntl } from 'react-intl';
-import { FormattedRelativeDate } from '@plone/volto/components';
-import { createContent } from '@plone/volto/actions';
-import { validateFileUploadSize, usePrevious } from '@plone/volto/helpers';
+import FormattedRelativeDate from '@plone/volto/components/theme/FormattedDate/FormattedRelativeDate';
+import { createContent } from '@plone/volto/actions/content/content';
+import { validateFileUploadSize } from '@plone/volto/helpers/FormValidation/FormValidation';
+import { usePrevious } from '@plone/volto/helpers/Utils/usePrevious';
 
 const Dropzone = loadable(() => import('react-dropzone'));
 

package/src/components/manage/Contents/ContentsWorkflowModal.jsx

@@ -1,11 +1,18 @@
 import React, { useCallback, useEffect } from 'react';
 import PropTypes from 'prop-types';
 import { shallowEqual, useDispatch, useSelector } from 'react-redux';
-import { concat, filter, last, map, uniqBy } from 'lodash';
+import concat from 'lodash/concat';
+import filter from 'lodash/filter';
+import last from 'lodash/last';
+import map from 'lodash/map';
+import uniqBy from 'lodash/uniqBy';
 import { defineMessages, useIntl } from 'react-intl';
 
-import { usePrevious } from '@plone/volto/helpers';
-import { getWorkflow, transitionWorkflow } from '@plone/volto/actions';
+import { usePrevious } from '@plone/volto/helpers/Utils/usePrevious';
+import {
+  getWorkflow,
+  transitionWorkflow,
+} from '@plone/volto/actions/workflow/workflow';
 import { ModalForm } from '@plone/volto/components/manage/Form';
 
 const messages = defineMessages({

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

@@ -2,7 +2,7 @@ import React, { useState, useEffect, useCallback } from 'react';
 import { useDispatch, useSelector, shallowEqual } from 'react-redux';
 import { Link } from 'react-router-dom';
 import { createPortal } from 'react-dom';
-import { useClient } from '@plone/volto/hooks';
+import { useClient } from '@plone/volto/hooks/client/useClient';
 import {
   Accordion,
   Button,
@@ -22,9 +22,11 @@ import {
   listAddons,
   uninstallAddon,
   upgradeAddon,
-} from '@plone/volto/actions';
-import { Helmet } from '@plone/volto/helpers';
-import { Icon, Toolbar, Toast } from '@plone/volto/components';
+} from '@plone/volto/actions/addons/addons';
+import Helmet from '@plone/volto/helpers/Helmet/Helmet';
+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 circleBottomSVG from '@plone/volto/icons/circle-bottom.svg';
 import circleTopSVG from '@plone/volto/icons/circle-top.svg';
 import backSVG from '@plone/volto/icons/back.svg';

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

@@ -1,7 +1,8 @@
 import { useState, useEffect, useCallback, useMemo } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import { Link, useHistory, useLocation } 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 {
   removeAliases,
   addAliases,
@@ -27,15 +28,16 @@ import { FormattedMessage, defineMessages, useIntl } from 'react-intl';
 import DatetimeWidget from '@plone/volto/components/manage/Widgets/DatetimeWidget';
 import FormFieldWrapper from '@plone/volto/components/manage/Widgets/FormFieldWrapper';
 import { ModalForm } from '@plone/volto/components/manage/Form';
-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 '@plone/volto/components/manage/Toast/Toast';
 import FormattedDate from '@plone/volto/components/theme/FormattedDate/FormattedDate';
-import { useClient } from '@plone/volto/hooks';
+import { useClient } from '@plone/volto/hooks/client/useClient';
 
 import backSVG from '@plone/volto/icons/back.svg';
 import editingSVG from '@plone/volto/icons/editing.svg';
-import { map } from 'lodash';
+import map from 'lodash/map';
 import { toast } from 'react-toastify';
-import { Toast } from '@plone/volto/components';
 
 const messages = defineMessages({
   back: {

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

@@ -7,15 +7,23 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 import { compose } from 'redux';
-import { getParentUrl } from '@plone/volto/helpers';
+import { getParentUrl } from '@plone/volto/helpers/Url/Url';
 import { createPortal } from 'react-dom';
 import { Button, Header } from 'semantic-ui-react';
 import { defineMessages, injectIntl } from 'react-intl';
 import { toast } from 'react-toastify';
-import { last, nth, join } from 'lodash';
-import { Error, Icon, Toolbar, Toast } from '@plone/volto/components';
+import last from 'lodash/last';
+import nth from 'lodash/nth';
+import join from 'lodash/join';
+import Error from '@plone/volto/components/theme/Error/Error';
+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 { getControlpanel, updateControlpanel } from '@plone/volto/actions';
+import {
+  getControlpanel,
+  updateControlpanel,
+} from '@plone/volto/actions/controlpanels/controlpanels';
 
 import saveSVG from '@plone/volto/icons/save.svg';
 import clearSVG from '@plone/volto/icons/clear.svg';

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

@@ -8,25 +8,29 @@ import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 import { compose } from 'redux';
 import { Link } from 'react-router-dom';
+import { getParentUrl } from '@plone/volto/helpers/Url/Url';
 import {
-  getParentUrl,
   hasBlocksData,
   getBlocksFieldname,
   getBlocksLayoutFieldname,
-} from '@plone/volto/helpers';
+} from '@plone/volto/helpers/Blocks/Blocks';
 import { createPortal } from 'react-dom';
 import { Button, Segment } from 'semantic-ui-react';
 import { toast } from 'react-toastify';
 import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
-import { nth, join } from 'lodash';
-import { Error, Icon, Toolbar, Sidebar, Toast } from '@plone/volto/components';
+import nth from 'lodash/nth';
+import join from 'lodash/join';
+import Error from '@plone/volto/components/theme/Error/Error';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
+import Toolbar from '@plone/volto/components/manage/Toolbar/Toolbar';
+import Sidebar from '@plone/volto/components/manage/Sidebar/Sidebar';
+import Toast from '@plone/volto/components/manage/Toast/Toast';
 import { Form } from '@plone/volto/components/manage/Form';
+import { getSchema, updateSchema } from '@plone/volto/actions/schema/schema';
 import {
-  getSchema,
-  updateSchema,
   getControlpanel,
   updateControlpanel,
-} from '@plone/volto/actions';
+} from '@plone/volto/actions/controlpanels/controlpanels';
 
 import saveSVG from '@plone/volto/icons/save.svg';
 import clearSVG from '@plone/volto/icons/clear.svg';

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

@@ -3,10 +3,13 @@
  * @module components/manage/Controlpanels/ContentTypeSchema
  */
 
-import { getSchema, putSchema } from '@plone/volto/actions';
-import { getParentUrl } from '@plone/volto/helpers';
-import { nth } from 'lodash';
-import { Error, Icon, Toast, Toolbar } from '@plone/volto/components';
+import { getSchema, putSchema } from '@plone/volto/actions/schema/schema';
+import { getParentUrl } from '@plone/volto/helpers/Url/Url';
+import nth from 'lodash/nth';
+import Error from '@plone/volto/components/theme/Error/Error';
+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 { Form } from '@plone/volto/components/manage/Form';
 import clearSVG from '@plone/volto/icons/clear.svg';
 import saveSVG from '@plone/volto/icons/save.svg';

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

@@ -8,20 +8,22 @@ import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 import { compose } from 'redux';
 import { Link } from 'react-router-dom';
-import { getParentUrl } from '@plone/volto/helpers';
+import { getParentUrl, getId } from '@plone/volto/helpers/Url/Url';
 import { createPortal } from 'react-dom';
-import { last } from 'lodash';
+import last from 'lodash/last';
 import { Confirm, Container, Table, Button, Header } from 'semantic-ui-react';
 import { toast } from 'react-toastify';
 import { FormattedMessage, defineMessages, injectIntl } from 'react-intl';
-import { Error, Icon, Toolbar, Toast } from '@plone/volto/components';
+import Error from '@plone/volto/components/theme/Error/Error';
+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 ContentTypesActions from '@plone/volto/components/manage/Controlpanels/ContentTypesActions';
 import {
   getControlpanel,
   postControlpanel,
   deleteControlpanel,
-} from '@plone/volto/actions';
-import { getId } from '@plone/volto/helpers';
+} from '@plone/volto/actions/controlpanels/controlpanels';
 
 import addSVG from '@plone/volto/icons/add-document.svg';
 import backSVG from '@plone/volto/icons/back.svg';

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

@@ -6,7 +6,7 @@
 import React from 'react';
 import { Dropdown } from 'semantic-ui-react';
 import { FormattedMessage, injectIntl } from 'react-intl';
-import { Icon } from '@plone/volto/components';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
 import trashSVG from '@plone/volto/icons/delete.svg';
 import layoutSVG from '@plone/volto/icons/file.svg';
 import folderSVG from '@plone/volto/icons/folder.svg';

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

@@ -8,19 +8,24 @@ import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 import { compose } from 'redux';
 import { withRouter } from 'react-router-dom';
+import Helmet from '@plone/volto/helpers/Helmet/Helmet';
 import {
-  Helmet,
   tryParseJSON,
   extractInvariantErrors,
-} from '@plone/volto/helpers';
+} from '@plone/volto/helpers/FormValidation/FormValidation';
 import { createPortal } from 'react-dom';
 import { Button, Container } from 'semantic-ui-react';
 import { defineMessages, injectIntl } from 'react-intl';
 import { toast } from 'react-toastify';
 
-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 { updateControlpanel, getControlpanel } from '@plone/volto/actions';
+import {
+  updateControlpanel,
+  getControlpanel,
+} from '@plone/volto/actions/controlpanels/controlpanels';
 
 import config from '@plone/volto/registry';