@plone/volto 18.1.2 → 18.2.0

package/src/components/manage/WorkingCopyToastsFactory/WorkingCopyToastsFactory.jsx

@@ -4,9 +4,9 @@ import { toast } from 'react-toastify';
 import { useSelector } from 'react-redux';
 import { useLocation } from 'react-router-dom';
 import { defineMessages, useIntl } from 'react-intl';
-import { Toast } from '@plone/volto/components';
-import { flattenToAppURL } from '@plone/volto/helpers';
-import { FormattedDate } from '@plone/volto/components';
+import Toast from '@plone/volto/components/manage/Toast/Toast';
+import { flattenToAppURL } from '@plone/volto/helpers/Url/Url';
+import FormattedDate from '@plone/volto/components/theme/FormattedDate/FormattedDate';
 import config from '@plone/volto/registry';
 import useDeepCompareEffect from 'use-deep-compare-effect';
 

package/src/components/theme/Anontools/Anontools.jsx

@@ -2,7 +2,7 @@ import PropTypes from 'prop-types';
 import { Link } from 'react-router-dom';
 import { Menu } from 'semantic-ui-react';
 import { FormattedMessage } from 'react-intl';
-import { flattenToAppURL } from '@plone/volto/helpers';
+import { flattenToAppURL } from '@plone/volto/helpers/Url/Url';
 import config from '@plone/volto/registry';
 import { useSelector, shallowEqual } from 'react-redux';
 

package/src/components/theme/App/App.jsx

@@ -8,7 +8,8 @@ import jwtDecode from 'jwt-decode';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 import { compose } from 'redux';
-import { asyncConnect, Helmet } from '@plone/volto/helpers';
+import { asyncConnect } from '@plone/volto/helpers/AsyncConnect';
+import Helmet from '@plone/volto/helpers/Helmet/Helmet';
 import { Segment } from 'semantic-ui-react';
 import { renderRoutes } from 'react-router-config';
 import { Slide, ToastContainer, toast } from 'react-toastify';
@@ -23,29 +24,21 @@ import { injectIntl } from 'react-intl';
 
 import Error from '@plone/volto/error';
 
-import {
-  Breadcrumbs,
-  Footer,
-  Header,
-  Icon,
-  OutdatedBrowser,
-  AppExtras,
-  SkipLinks,
-} from '@plone/volto/components';
-import {
-  BodyClass,
-  getBaseUrl,
-  getView,
-  hasApiExpander,
-  isCmsUi,
-} from '@plone/volto/helpers';
-import {
-  getBreadcrumbs,
-  getContent,
-  getNavigation,
-  getTypes,
-  getWorkflow,
-} from '@plone/volto/actions';
+import Breadcrumbs from '@plone/volto/components/theme/Breadcrumbs/Breadcrumbs';
+import Footer from '@plone/volto/components/theme/Footer/Footer';
+import Header from '@plone/volto/components/theme/Header/Header';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
+import OutdatedBrowser from '@plone/volto/components/theme/OutdatedBrowser/OutdatedBrowser';
+import AppExtras from '@plone/volto/components/theme/AppExtras/AppExtras';
+import SkipLinks from '@plone/volto/components/theme/SkipLinks/SkipLinks';
+import BodyClass from '@plone/volto/helpers/BodyClass/BodyClass';
+import { getBaseUrl, getView, isCmsUi } from '@plone/volto/helpers/Url/Url';
+import { hasApiExpander } from '@plone/volto/helpers/Utils/Utils';
+import { getBreadcrumbs } from '@plone/volto/actions/breadcrumbs/breadcrumbs';
+import { getContent } from '@plone/volto/actions/content/content';
+import { getNavigation } from '@plone/volto/actions/navigation/navigation';
+import { getTypes } from '@plone/volto/actions/types/types';
+import { getWorkflow } from '@plone/volto/actions/workflow/workflow';
 
 import clearSVG from '@plone/volto/icons/clear.svg';
 import MultilingualRedirector from '@plone/volto/components/theme/MultilingualRedirector/MultilingualRedirector';

package/src/components/theme/Avatar/Avatar.jsx

@@ -4,7 +4,7 @@
  */
 import React from 'react';
 import PropTypes from 'prop-types';
-import { getInitials } from '@plone/volto/helpers';
+import { getInitials } from '@plone/volto/helpers/Utils/Utils';
 
 const defaultSize = 30;
 const defaultColor = 'Teal';

package/src/components/theme/Breadcrumbs/Breadcrumbs.jsx

@@ -5,9 +5,10 @@ import { Breadcrumb, Container, Segment } from 'semantic-ui-react';
 import { defineMessages, useIntl } from 'react-intl';
 import { useDispatch, useSelector, shallowEqual } from 'react-redux';
 
-import { getBreadcrumbs } from '@plone/volto/actions';
-import { getBaseUrl, hasApiExpander } from '@plone/volto/helpers';
-import { Icon } from '@plone/volto/components';
+import { getBreadcrumbs } from '@plone/volto/actions/breadcrumbs/breadcrumbs';
+import { getBaseUrl } from '@plone/volto/helpers/Url/Url';
+import { hasApiExpander } from '@plone/volto/helpers/Utils/Utils';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
 import homeSVG from '@plone/volto/icons/home.svg';
 
 const messages = defineMessages({

package/src/components/theme/Comments/CommentEditModal.jsx

@@ -3,8 +3,8 @@ import PropTypes from 'prop-types';
 import { useDispatch, useSelector, shallowEqual } from 'react-redux';
 import { defineMessages, useIntl } from 'react-intl';
 
-import { usePrevious } from '@plone/volto/helpers';
-import { updateComment } from '@plone/volto/actions';
+import { usePrevious } from '@plone/volto/helpers/Utils/usePrevious';
+import { updateComment } from '@plone/volto/actions/comments/comments';
 import { ModalForm } from '@plone/volto/components/manage/Form';
 
 const messages = defineMessages({

package/src/components/theme/Comments/Comments.jsx

@@ -12,16 +12,13 @@ import {
   deleteComment,
   listComments,
   listMoreComments,
-} from '@plone/volto/actions';
-import { Avatar } from '@plone/volto/components';
+} from '@plone/volto/actions/comments/comments';
+import Avatar from '@plone/volto/components/theme/Avatar/Avatar';
 import { Form } from '@plone/volto/components/manage/Form';
 import { CommentEditModal } from '@plone/volto/components/theme/Comments';
-import {
-  flattenToAppURL,
-  getBaseUrl,
-  getColor,
-  usePrevious,
-} from '@plone/volto/helpers';
+import { flattenToAppURL, getBaseUrl } from '@plone/volto/helpers/Url/Url';
+import { getColor } from '@plone/volto/helpers/Utils/Utils';
+import { usePrevious } from '@plone/volto/helpers/Utils/usePrevious';
 
 const messages = defineMessages({
   comment: {

package/src/components/theme/ContactForm/ContactForm.jsx

@@ -5,12 +5,15 @@ import { defineMessages, useIntl } from 'react-intl';
 import { Link, useHistory, useLocation } from 'react-router-dom';
 import { toast } from 'react-toastify';
 
-import { emailNotification } from '@plone/volto/actions';
+import { emailNotification } from '@plone/volto/actions/emailNotification/emailNotification';
 import { useDispatch, useSelector } from 'react-redux';
-import { Toolbar, Toast } from '@plone/volto/components';
+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 { getBaseUrl, Helmet, usePrevious } from '@plone/volto/helpers';
-import { useClient } from '@plone/volto/hooks';
+import { getBaseUrl } from '@plone/volto/helpers/Url/Url';
+import Helmet from '@plone/volto/helpers/Helmet/Helmet';
+import { usePrevious } from '@plone/volto/helpers/Utils/usePrevious';
+import { useClient } from '@plone/volto/hooks/client/useClient';
 
 const messages = defineMessages({
   send: {

package/src/components/theme/ContentMetadataTags/ContentMetadataTags.jsx

@@ -1,11 +1,8 @@
 import React, { useEffect } from 'react';
-import {
-  toPublicURL,
-  Helmet,
-  hasApiExpander,
-  getBaseUrl,
-} from '@plone/volto/helpers';
-import { getNavroot } from '@plone/volto/actions';
+import Helmet from '@plone/volto/helpers/Helmet/Helmet';
+import { toPublicURL, getBaseUrl } from '@plone/volto/helpers/Url/Url';
+import { hasApiExpander } from '@plone/volto/helpers/Utils/Utils';
+import { getNavroot } from '@plone/volto/actions/navroot/navroot';
 import config from '@plone/volto/registry';
 import { useDispatch, useSelector } from 'react-redux';
 

package/src/components/theme/EventDetails/EventDetails.jsx

@@ -5,8 +5,8 @@ import {
   When,
   Recurrence,
 } from '@plone/volto/components/theme/View/EventDatesInfo';
-import { Icon } from '@plone/volto/components';
-import { expandToBackendURL } from '@plone/volto/helpers';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
+import { expandToBackendURL } from '@plone/volto/helpers/Url/Url';
 
 import calendarSVG from '@plone/volto/icons/calendar.svg';
 

package/src/components/theme/Footer/Footer.jsx

@@ -5,11 +5,11 @@
 
 import React from 'react';
 import { Container, List, Segment } from 'semantic-ui-react';
-import { map } from 'lodash';
+import map from 'lodash/map';
 import { FormattedMessage, defineMessages, injectIntl } from 'react-intl';
 import { useSelector, shallowEqual } from 'react-redux';
-import { UniversalLink } from '@plone/volto/components';
-import { flattenToAppURL, addAppURL } from '@plone/volto/helpers';
+import UniversalLink from '@plone/volto/components/manage/UniversalLink/UniversalLink';
+import { flattenToAppURL, addAppURL } from '@plone/volto/helpers/Url/Url';
 
 const messages = defineMessages({
   copyright: {

package/src/components/theme/Header/Header.jsx

@@ -2,13 +2,11 @@ import { Container, Segment } from 'semantic-ui-react';
 import PropTypes from 'prop-types';
 import { useSelector, shallowEqual } from 'react-redux';
 
-import {
-  Anontools,
-  LanguageSelector,
-  Logo,
-  Navigation,
-  SearchWidget,
-} from '@plone/volto/components';
+import Anontools from '@plone/volto/components/theme/Anontools/Anontools';
+import LanguageSelector from '@plone/volto/components/theme/LanguageSelector/LanguageSelector';
+import Logo from '@plone/volto/components/theme/Logo/Logo';
+import Navigation from '@plone/volto/components/theme/Navigation/Navigation';
+import SearchWidget from '@plone/volto/components/theme/SearchWidget/SearchWidget';
 
 const Header = ({ pathname }) => {
   const token = useSelector((state) => state.userSession.token, shallowEqual);

package/src/components/theme/Icon/Icon.stories.jsx

@@ -33,7 +33,7 @@ export default {
 // You can load icons from Volto using the `Icon` component:
 
 // ```jsx static
-// import { Icon } from '@plone/volto/components';
+// import Icon from '@plone/volto/components/theme/Icon/Icon';
 // import addIcon from '@plone/volto/icons/add.svg';
 
 // const IconTest = () => <Icon name={addIcon} size="18px" />;

package/src/components/theme/Image/Image.jsx

@@ -1,6 +1,6 @@
 import PropTypes from 'prop-types';
 import cx from 'classnames';
-import { flattenToAppURL, flattenScales } from '@plone/volto/helpers';
+import { flattenToAppURL, flattenScales } from '@plone/volto/helpers/Url/Url';
 
 /**
  * Image component

package/src/components/theme/LanguageSelector/LanguageSelector.jsx

@@ -9,14 +9,13 @@ import { Link } from 'react-router-dom';
 
 import { useSelector } from 'react-redux';
 import cx from 'classnames';
-import { find, map } from 'lodash';
+import find from 'lodash/find';
+import map from 'lodash/map';
 
-import {
-  Helmet,
-  langmap,
-  flattenToAppURL,
-  toReactIntlLang,
-} from '@plone/volto/helpers';
+import Helmet from '@plone/volto/helpers/Helmet/Helmet';
+import langmap from '@plone/volto/helpers/LanguageMap/LanguageMap';
+import { flattenToAppURL } from '@plone/volto/helpers/Url/Url';
+import { toReactIntlLang } from '@plone/volto/helpers/Utils/Utils';
 
 import config from '@plone/volto/registry';
 

package/src/components/theme/Login/Login.jsx

@@ -12,17 +12,18 @@ import {
 import { FormattedMessage, defineMessages, useIntl } from 'react-intl';
 import qs from 'query-string';
 
-import { Helmet, usePrevious } from '@plone/volto/helpers';
+import Helmet from '@plone/volto/helpers/Helmet/Helmet';
+import { usePrevious } from '@plone/volto/helpers/Utils/usePrevious';
 import config from '@plone/volto/registry';
-import { Icon } from '@plone/volto/components';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
 import {
   login,
   logout,
   resetLoginRequest,
-  purgeMessages,
-} from '@plone/volto/actions';
+} from '@plone/volto/actions/userSession/userSession';
+import { purgeMessages } from '@plone/volto/actions/messages/messages';
 import { toast } from 'react-toastify';
-import { Toast } from '@plone/volto/components';
+import Toast from '@plone/volto/components/manage/Toast/Toast';
 import aheadSVG from '@plone/volto/icons/ahead.svg';
 import clearSVG from '@plone/volto/icons/clear.svg';
 

package/src/components/theme/Logo/Logo.jsx

@@ -8,12 +8,9 @@ import { Image } from 'semantic-ui-react';
 import LogoImage from '@plone/volto/components/theme/Logo/Logo.svg';
 import { useSelector, useDispatch } from 'react-redux';
 import { Link, useLocation } from 'react-router-dom';
-import { getNavroot } from '@plone/volto/actions';
-import {
-  flattenToAppURL,
-  hasApiExpander,
-  getBaseUrl,
-} from '@plone/volto/helpers';
+import { getNavroot } from '@plone/volto/actions/navroot/navroot';
+import { flattenToAppURL, getBaseUrl } from '@plone/volto/helpers/Url/Url';
+import { hasApiExpander } from '@plone/volto/helpers/Utils/Utils';
 
 /**
  * Logo component class.

package/src/components/theme/Logout/Logout.jsx

@@ -3,8 +3,9 @@ import { useDispatch, useSelector, shallowEqual } from 'react-redux';
 import { useHistory } from 'react-router-dom';
 import { defineMessages, useIntl } from 'react-intl';
 import qs from 'query-string';
-import { Toast } from '@plone/volto/components';
-import { logout, purgeMessages } from '@plone/volto/actions';
+import Toast from '@plone/volto/components/manage/Toast/Toast';
+import { logout } from '@plone/volto/actions/userSession/userSession';
+import { purgeMessages } from '@plone/volto/actions/messages/messages';
 import { toast } from 'react-toastify';
 
 const messages = defineMessages({

package/src/components/theme/MultilingualRedirector/MultilingualRedirector.jsx

@@ -3,8 +3,8 @@ import { Redirect } from 'react-router-dom';
 import { useDispatch } from 'react-redux';
 import { useCookies } from 'react-cookie';
 import config from '@plone/volto/registry';
-import { changeLanguage } from '@plone/volto/actions';
-import { toGettextLang } from '@plone/volto/helpers';
+import { changeLanguage } from '@plone/volto/actions/language/language';
+import { toGettextLang } from '@plone/volto/helpers/Utils/Utils';
 
 const MultilingualRedirector = (props) => {
   const { settings } = config;

package/src/components/theme/Navigation/ContextNavigation.jsx

@@ -7,8 +7,9 @@ import { compose } from 'redux';
 import { withRouter } from 'react-router';
 import { defineMessages, useIntl } from 'react-intl';
 
-import { flattenToAppURL } from '@plone/volto/helpers';
-import { Icon, UniversalLink } from '@plone/volto/components';
+import { flattenToAppURL } from '@plone/volto/helpers/Url/Url';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
+import UniversalLink from '@plone/volto/components/manage/UniversalLink/UniversalLink';
 import { withContentNavigation } from './withContentNavigation';
 
 import leftIcon from '@plone/volto/icons/left-key.svg';

package/src/components/theme/Navigation/NavItem.jsx

@@ -1,6 +1,7 @@
 import React from 'react';
 import { NavLink } from 'react-router-dom';
-import { isInternalURL, toBackendLang } from '@plone/volto/helpers';
+import { isInternalURL } from '@plone/volto/helpers/Url/Url';
+import { toBackendLang } from '@plone/volto/helpers/Utils/Utils';
 import config from '@plone/volto/registry';
 
 const NavItem = ({ item, lang }) => {

package/src/components/theme/Navigation/Navigation.jsx

@@ -5,9 +5,11 @@ import { defineMessages, useIntl } from 'react-intl';
 import { Menu } from 'semantic-ui-react';
 
 import cx from 'classnames';
-import { BodyClass, getBaseUrl, hasApiExpander } from '@plone/volto/helpers';
+import BodyClass from '@plone/volto/helpers/BodyClass/BodyClass';
+import { getBaseUrl } from '@plone/volto/helpers/Url/Url';
+import { hasApiExpander } from '@plone/volto/helpers/Utils/Utils';
 import config from '@plone/volto/registry';
-import { getNavigation } from '@plone/volto/actions';
+import { getNavigation } from '@plone/volto/actions/navigation/navigation';
 import { CSSTransition } from 'react-transition-group';
 import NavItems from '@plone/volto/components/theme/Navigation/NavItems';
 

package/src/components/theme/Navigation/withContentNavigation.js

@@ -3,8 +3,8 @@ import React from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import useDeepCompareEffect from 'use-deep-compare-effect';
 
-import { getBaseUrl } from '@plone/volto/helpers';
-import { getContextNavigation } from '@plone/volto/actions';
+import { getBaseUrl } from '@plone/volto/helpers/Url/Url';
+import { getContextNavigation } from '@plone/volto/actions/contextNavigation/contextNavigation';
 
 export function withContentNavigation(WrappedComponent) {
   /**

package/src/components/theme/NotFound/NotFound.jsx

@@ -1,11 +1,14 @@
 import { useEffect } from 'react';
-import { BodyClass, toBackendLang } from '@plone/volto/helpers';
+import BodyClass from '@plone/volto/helpers/BodyClass/BodyClass';
 import { FormattedMessage } from 'react-intl';
 import { Link } from 'react-router-dom';
 import { Container } from 'semantic-ui-react';
-import { withServerErrorCode } from '@plone/volto/helpers/Utils/Utils';
+import {
+  toBackendLang,
+  withServerErrorCode,
+} from '@plone/volto/helpers/Utils/Utils';
 import { useDispatch, useSelector } from 'react-redux';
-import { getNavigation } from '@plone/volto/actions';
+import { getNavigation } from '@plone/volto/actions/navigation/navigation';
 import config from '@plone/volto/registry';
 
 /**

package/src/components/theme/Pagination/Pagination.jsx

@@ -5,9 +5,9 @@
 
 import React from 'react';
 import { Menu } from 'semantic-ui-react';
-import { Icon } from '@plone/volto/components';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
 import PropTypes from 'prop-types';
-import { map } from 'lodash';
+import map from 'lodash/map';
 import { FormattedMessage, injectIntl } from 'react-intl';
 import leftChevron from '@plone/volto/icons/left-key.svg';
 import rightChevron from '@plone/volto/icons/right-key.svg';

package/src/components/theme/PasswordReset/PasswordReset.jsx

@@ -8,12 +8,12 @@ import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 import { compose } from 'redux';
 import { Link, withRouter } from 'react-router-dom';
-import { Helmet } from '@plone/volto/helpers';
+import Helmet from '@plone/volto/helpers/Helmet/Helmet';
 import { Container } from 'semantic-ui-react';
 import { FormattedMessage, defineMessages, injectIntl } from 'react-intl';
 
 import { Form } from '@plone/volto/components/manage/Form';
-import { setInitialPassword } from '@plone/volto/actions';
+import { setInitialPassword } from '@plone/volto/actions/users/users';
 import config from '@plone/volto/registry';
 
 const messages = defineMessages({

package/src/components/theme/PasswordReset/RequestPasswordReset.jsx

@@ -4,9 +4,10 @@ import { useHistory } from 'react-router-dom';
 import { Container } from 'semantic-ui-react';
 import { FormattedMessage, defineMessages, useIntl } from 'react-intl';
 
-import { Helmet, usePrevious } from '@plone/volto/helpers';
+import Helmet from '@plone/volto/helpers/Helmet/Helmet';
+import { usePrevious } from '@plone/volto/helpers/Utils/usePrevious';
 import { Form } from '@plone/volto/components/manage/Form';
-import { resetPassword } from '@plone/volto/actions';
+import { resetPassword } from '@plone/volto/actions/users/users';
 import config from '@plone/volto/registry';
 
 const messages = defineMessages({

package/src/components/theme/Register/Register.jsx

@@ -4,10 +4,11 @@ import { defineMessages, useIntl } from 'react-intl';
 import { useHistory } from 'react-router-dom';
 import { toast } from 'react-toastify';
 
-import { Helmet, usePrevious } from '@plone/volto/helpers';
-import { Toast } from '@plone/volto/components';
+import Helmet from '@plone/volto/helpers/Helmet/Helmet';
+import { usePrevious } from '@plone/volto/helpers/Utils/usePrevious';
+import Toast from '@plone/volto/components/manage/Toast/Toast';
 import { Form } from '@plone/volto/components/manage/Form';
-import { createUser } from '@plone/volto/actions';
+import { createUser } from '@plone/volto/actions/users/users';
 
 const messages = defineMessages({
   title: {

package/src/components/theme/Search/Search.jsx

@@ -7,8 +7,8 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 import { compose } from 'redux';
-import { UniversalLink } from '@plone/volto/components';
-import { asyncConnect } from '@plone/volto/helpers';
+import UniversalLink from '@plone/volto/components/manage/UniversalLink/UniversalLink';
+import { asyncConnect } from '@plone/volto/helpers/AsyncConnect';
 import { FormattedMessage } from 'react-intl';
 import { createPortal } from 'react-dom';
 import { Container, Pagination, Button, Header } from 'semantic-ui-react';
@@ -16,9 +16,11 @@ import qs from 'query-string';
 import classNames from 'classnames';
 import { defineMessages, injectIntl } from 'react-intl';
 import config from '@plone/volto/registry';
-import { Helmet } from '@plone/volto/helpers';
-import { searchContent } from '@plone/volto/actions';
-import { SearchTags, Toolbar, Icon } from '@plone/volto/components';
+import Helmet from '@plone/volto/helpers/Helmet/Helmet';
+import { searchContent } from '@plone/volto/actions/search/search';
+import SearchTags from '@plone/volto/components/theme/Search/SearchTags';
+import Toolbar from '@plone/volto/components/manage/Toolbar/Toolbar';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
 
 import paginationLeftSVG from '@plone/volto/icons/left-key.svg';
 import paginationRightSVG from '@plone/volto/icons/right-key.svg';

package/src/components/theme/Search/SearchTags.jsx

@@ -2,7 +2,7 @@ import { useEffect } from 'react';
 import { useDispatch, useSelector, shallowEqual } from 'react-redux';
 import { Link } from 'react-router-dom';
 
-import { getVocabulary } from '@plone/volto/actions';
+import { getVocabulary } from '@plone/volto/actions/vocabularies/vocabularies';
 
 const vocabulary = 'plone.app.vocabularies.Keywords';
 

package/src/components/theme/SearchWidget/SearchWidget.jsx

@@ -4,9 +4,10 @@ import { Form, Input } from 'semantic-ui-react';
 import { defineMessages, useIntl } from 'react-intl';
 import { useDispatch, useSelector } from 'react-redux';
 
-import { getNavroot } from '@plone/volto/actions';
-import { hasApiExpander, getBaseUrl } from '@plone/volto/helpers';
-import { Icon } from '@plone/volto/components';
+import { getNavroot } from '@plone/volto/actions/navroot/navroot';
+import { hasApiExpander } from '@plone/volto/helpers/Utils/Utils';
+import { getBaseUrl } from '@plone/volto/helpers/Url/Url';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
 import zoomSVG from '@plone/volto/icons/zoom.svg';
 
 const messages = defineMessages({

package/src/components/theme/Sitemap/Sitemap.jsx

@@ -2,14 +2,15 @@ import { useEffect } from 'react';
 import PropTypes from 'prop-types';
 import { compose } from 'redux';
 import { connect } from 'react-redux';
-import { asyncConnect } from '@plone/volto/helpers';
+import { asyncConnect } from '@plone/volto/helpers/AsyncConnect';
 import { defineMessages, injectIntl } from 'react-intl';
 import { Container as SemanticContainer } from 'semantic-ui-react';
-import { Helmet, toBackendLang } from '@plone/volto/helpers';
+import Helmet from '@plone/volto/helpers/Helmet/Helmet';
+import { toBackendLang } from '@plone/volto/helpers/Utils/Utils';
 import { Link } from 'react-router-dom';
 import config from '@plone/volto/registry';
 
-import { getNavigation } from '@plone/volto/actions';
+import { getNavigation } from '@plone/volto/actions/navigation/navigation';
 
 const messages = defineMessages({
   Sitemap: {

package/src/components/theme/Unauthorized/Unauthorized.jsx

@@ -4,7 +4,7 @@ import { Container } from 'semantic-ui-react';
 import { useSelector } from 'react-redux';
 import { useLocation } from 'react-router-dom';
 import { withServerErrorCode } from '@plone/volto/helpers/Utils/Utils';
-import { getBaseUrl } from '@plone/volto/helpers';
+import { getBaseUrl } from '@plone/volto/helpers/Url/Url';
 
 const Unauthorized = () => {
   const error_message = useSelector((state) => state.apierror?.message);

package/src/components/theme/View/AlbumView.jsx

@@ -6,7 +6,8 @@ import {
   Segment,
 } from 'semantic-ui-react';
 import { Button, Modal, Grid } from 'semantic-ui-react';
-import { Icon, UniversalLink } from '@plone/volto/components';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
+import UniversalLink from '@plone/volto/components/manage/UniversalLink/UniversalLink';
 import config from '@plone/volto/registry';
 
 import openSVG from '@plone/volto/icons/open.svg';

package/src/components/theme/View/DefaultView.jsx

@@ -13,14 +13,15 @@ import {
   Label,
 } from 'semantic-ui-react';
 import config from '@plone/volto/registry';
-import { getSchema } from '@plone/volto/actions';
+import { getSchema } from '@plone/volto/actions/schema/schema';
 import { getWidget } from '@plone/volto/helpers/Widget/utils';
 import RenderBlocks from '@plone/volto/components/theme/View/RenderBlocks';
 
-import { hasBlocksData, getBaseUrl } from '@plone/volto/helpers';
+import { hasBlocksData } from '@plone/volto/helpers/Blocks/Blocks';
+import { getBaseUrl } from '@plone/volto/helpers/Url/Url';
 import { useDispatch, useSelector } from 'react-redux';
 
-import { isEqual } from 'lodash';
+import isEqual from 'lodash/isEqual';
 
 /**
  * Component to display the default view.

package/src/components/theme/View/EventDatesInfo.jsx

@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import { List } from 'semantic-ui-react';
 import cx from 'classnames';
 
-import { toBackendLang } from '@plone/volto/helpers';
+import { toBackendLang } from '@plone/volto/helpers/Utils/Utils';
 import { injectLazyLibs } from '@plone/volto/helpers/Loadable/Loadable';
 import { useSelector } from 'react-redux';
 

package/src/components/theme/View/EventView.jsx

@@ -5,10 +5,11 @@
 
 import React from 'react';
 import PropTypes from 'prop-types';
-import { hasBlocksData, flattenHTMLToAppURL } from '@plone/volto/helpers';
+import { hasBlocksData } from '@plone/volto/helpers/Blocks/Blocks';
+import { flattenHTMLToAppURL } from '@plone/volto/helpers/Url/Url';
 import { Grid } from 'semantic-ui-react';
 import RenderBlocks from '@plone/volto/components/theme/View/RenderBlocks';
-import { EventDetails } from '@plone/volto/components';
+import EventDetails from '@plone/volto/components/theme/EventDetails/EventDetails';
 import { Container as SemanticContainer } from 'semantic-ui-react';
 import config from '@plone/volto/registry';
 

package/src/components/theme/View/FileView.jsx

@@ -6,7 +6,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { Container as SemanticContainer } from 'semantic-ui-react';
-import { flattenToAppURL } from '@plone/volto/helpers';
+import { flattenToAppURL } from '@plone/volto/helpers/Url/Url';
 import config from '@plone/volto/registry';
 
 /**