@plone/volto 18.1.2 → 18.2.1

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';
 

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

@@ -3,8 +3,13 @@
  * @module components/manage/Controlpanels/Controlpanels
  */
 
-import { Helmet } from '@plone/volto/helpers';
-import { concat, filter, last, map, sortBy, uniqBy } from 'lodash';
+import Helmet from '@plone/volto/helpers/Helmet/Helmet';
+import concat from 'lodash/concat';
+import filter from 'lodash/filter';
+import last from 'lodash/last';
+import map from 'lodash/map';
+import sortBy from 'lodash/sortBy';
+import uniqBy from 'lodash/uniqBy';
 import { useEffect, useState } from 'react';
 import { FormattedMessage, defineMessages, useIntl } from 'react-intl';
 import { createPortal } from 'react-dom';
@@ -12,7 +17,10 @@ import { useSelector } from 'react-redux';
 import { Link } from 'react-router-dom';
 import { Container, Grid, Header, Message, Segment } from 'semantic-ui-react';
 
-import { Error, Icon, Toolbar, VersionOverview } 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 VersionOverview from '@plone/volto/components/manage/Controlpanels/VersionOverview';
 
 import config from '@plone/volto/registry';
 

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

@@ -5,10 +5,11 @@ import { createPortal } from 'react-dom';
 import { Container, Divider, Message, Segment, Table } from 'semantic-ui-react';
 import { FormattedMessage, defineMessages, useIntl } from 'react-intl';
 
-import { getDatabaseInformation } from '@plone/volto/actions';
-import { Helmet } from '@plone/volto/helpers';
-import { useClient } from '@plone/volto/hooks';
-import { Icon, Toolbar } from '@plone/volto/components';
+import { getDatabaseInformation } from '@plone/volto/actions/controlpanels/controlpanels';
+import Helmet from '@plone/volto/helpers/Helmet/Helmet';
+import { useClient } from '@plone/volto/hooks/client/useClient';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
+import Toolbar from '@plone/volto/components/manage/Toolbar/Toolbar';
 import backSVG from '@plone/volto/icons/back.svg';
 
 const messages = defineMessages({

package/src/components/manage/Controlpanels/Groups/GroupsControlpanel.jsx

@@ -6,34 +6,31 @@ import {
   createGroup,
   deleteGroup,
   listGroups,
-  getControlpanel,
-  listRoles,
   updateGroup,
-  authenticatedRole,
-  getUser,
-} from '@plone/volto/actions';
+} from '@plone/volto/actions/groups/groups';
+import { listRoles } from '@plone/volto/actions/roles/roles';
+import { getControlpanel } from '@plone/volto/actions/controlpanels/controlpanels';
+import { authenticatedRole } from '@plone/volto/actions/authRole/authRole';
+import { getUser } from '@plone/volto/actions/users/users';
 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 RenderGroups from '@plone/volto/components/manage/Controlpanels/Groups/RenderGroups';
 import { ModalForm } from '@plone/volto/components/manage/Form';
 import { Link } from 'react-router-dom';
-import {
-  Helmet,
-  messages,
-  isManager,
-  canAssignRole,
-} from '@plone/volto/helpers';
+import Helmet from '@plone/volto/helpers/Helmet/Helmet';
+import { messages } from '@plone/volto/helpers/MessageLabels/MessageLabels';
+import { isManager, canAssignRole } 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 } from 'lodash';
+import find from 'lodash/find';
+import map from 'lodash/map';
+import pull from 'lodash/pull';
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import { FormattedMessage, injectIntl } from 'react-intl';

package/src/components/manage/Controlpanels/Groups/RenderGroups.jsx

@@ -3,8 +3,8 @@ import { FormattedMessage } from 'react-intl';
 import { Dropdown, Table, Checkbox } from 'semantic-ui-react';
 import trashSVG from '@plone/volto/icons/delete.svg';
 import ploneSVG from '@plone/volto/icons/plone.svg';
-import { Icon } from '@plone/volto/components';
-import { canAssignRole } from '@plone/volto/helpers';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
+import { canAssignRole } from '@plone/volto/helpers/User/User';
 
 const RenderGroups = (props) => {
   const onChange = (event, { value }) => {

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

@@ -8,13 +8,17 @@ import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 import { compose } from 'redux';
 import { Link } from 'react-router-dom';
-import { getParentUrl, Helmet } from '@plone/volto/helpers';
+import { getParentUrl } from '@plone/volto/helpers/Url/Url';
+import Helmet from '@plone/volto/helpers/Helmet/Helmet';
 import { createPortal } from 'react-dom';
 import { Container, Button, Table } from 'semantic-ui-react';
 import { FormattedMessage, defineMessages, injectIntl } from 'react-intl';
 
-import { deleteComment, searchContent } from '@plone/volto/actions';
-import { FormattedRelativeDate, Icon, Toolbar } from '@plone/volto/components';
+import { deleteComment } from '@plone/volto/actions/comments/comments';
+import { searchContent } from '@plone/volto/actions/search/search';
+import FormattedRelativeDate from '@plone/volto/components/theme/FormattedDate/FormattedRelativeDate';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
+import Toolbar from '@plone/volto/components/manage/Toolbar/Toolbar';
 import { CommentEditModal } from '@plone/volto/components/theme/Comments';
 
 import backSVG from '@plone/volto/icons/back.svg';

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

@@ -1,11 +1,11 @@
 import React, { useEffect } from 'react';
-import { uniqBy } from 'lodash';
+import uniqBy from 'lodash/uniqBy';
 import { FormattedMessage } from 'react-intl';
 import { useSelector, useDispatch } from 'react-redux';
 import { Divider, Segment, Table } from 'semantic-ui-react';
-import { queryRelations } from '@plone/volto/actions';
-import { flattenToAppURL } from '@plone/volto/helpers';
-import { ConditionalLink } from '@plone/volto/components';
+import { queryRelations } from '@plone/volto/actions/relations/relations';
+import { flattenToAppURL } from '@plone/volto/helpers/Url/Url';
+import ConditionalLink from '@plone/volto/components/manage/ConditionalLink/ConditionalLink';
 
 const BrokenRelations = () => {
   const dispatch = useDispatch();

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

@@ -2,7 +2,7 @@
  * Relations Control Panel
  */
 import React, { useEffect, useState } from 'react';
-import { find } from 'lodash';
+import find from 'lodash/find';
 import { useSelector } from 'react-redux';
 import { createPortal } from 'react-dom';
 import { useHistory } from 'react-router';
@@ -10,10 +10,12 @@ import { Link, useLocation } from 'react-router-dom';
 import { FormattedMessage, useIntl } from 'react-intl';
 import { useDispatch } from 'react-redux';
 import { Divider, Message, Segment } from 'semantic-ui-react';
-import { Helmet, messages } from '@plone/volto/helpers';
-import { listActions } from '@plone/volto/actions';
-import { Icon, Toolbar } from '@plone/volto/components';
-import { getParentUrl } from '@plone/volto/helpers';
+import Helmet from '@plone/volto/helpers/Helmet/Helmet';
+import { messages } from '@plone/volto/helpers/MessageLabels/MessageLabels';
+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 { getParentUrl } from '@plone/volto/helpers/Url/Url';
 import RelationsMatrix from '@plone/volto/components/manage/Controlpanels/Relations/RelationsMatrix';
 import backSVG from '@plone/volto/icons/back.svg';
 

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

@@ -3,17 +3,20 @@ import useDeepCompareEffect from 'use-deep-compare-effect';
 import { FormattedMessage, useIntl } from 'react-intl';
 import { useSelector, useDispatch } from 'react-redux';
 import { toast } from 'react-toastify';
-import { uniqBy } from 'lodash';
+import uniqBy from 'lodash/uniqBy';
 import { Checkbox, Message } from 'semantic-ui-react';
-import { messages } from '@plone/volto/helpers';
-import { Toast, UniversalLink } from '@plone/volto/components';
+import { messages } from '@plone/volto/helpers/MessageLabels/MessageLabels';
+import Toast from '@plone/volto/components/manage/Toast/Toast';
+import UniversalLink from '@plone/volto/components/manage/UniversalLink/UniversalLink';
 import {
   createRelations,
   deleteRelations,
   queryRelations,
+} from '@plone/volto/actions/relations/relations';
+import {
   resetSearchContent,
   searchContent,
-} from '@plone/volto/actions';
+} from '@plone/volto/actions/search/search';
 
 const RelationsListing = ({
   relationtype,