@strapi/admin 4.14.5 → 4.15.0

package/admin/src/pages/Admin/index.js

@@ -12,12 +12,12 @@ import { HTML5Backend } from 'react-dnd-html5-backend';
 import { useDispatch, useSelector } from 'react-redux';
 import { Route, Switch } from 'react-router-dom';
 
-import GuidedTourModal from '../../components/GuidedTour/Modal';
+import { GuidedTourModal } from '../../components/GuidedTour/Modal';
 import { LeftMenu } from '../../components/LeftMenu';
 import { useConfiguration } from '../../hooks/useConfiguration';
 import { useMenu } from '../../hooks/useMenu';
-import AppLayout from '../../layouts/AppLayout';
-import { createRoute } from '../../utils';
+import { AppLayout } from '../../layouts/AppLayout';
+import { createRoute } from '../../utils/createRoute';
 import { SET_APP_RUNTIME_STATUS } from '../App/constants';
 
 import Onboarding from './Onboarding';
@@ -33,10 +33,16 @@ const MarketplacePage = lazy(() =>
   import(/* webpackChunkName: "Admin_marketplace" */ '../MarketplacePage')
 );
 const NotFoundPage = lazy(() =>
-  import(/* webpackChunkName: "Admin_NotFoundPage" */ '../NotFoundPage')
+  import(/* webpackChunkName: "Admin_NotFoundPage" */ '../NotFoundPage').then(
+    ({ NotFoundPage }) => ({ default: NotFoundPage })
+  )
 );
 const InternalErrorPage = lazy(() =>
-  import(/* webpackChunkName: "Admin_InternalErrorPage" */ '../InternalErrorPage')
+  import(/* webpackChunkName: "Admin_InternalErrorPage" */ '../InternalErrorPage').then(
+    ({ InternalErrorPage }) => ({
+      default: InternalErrorPage,
+    })
+  )
 );
 
 const ProfilePage = lazy(() =>

package/admin/src/pages/App/index.js

@@ -25,15 +25,18 @@ import { PrivateRoute } from '../../components/PrivateRoute';
 import { ADMIN_PERMISSIONS_CE } from '../../constants';
 import { useConfiguration } from '../../hooks/useConfiguration';
 import { useEnterprise } from '../../hooks/useEnterprise';
-import { createRoute, makeUniqueRoutes } from '../../utils';
+import { createRoute } from '../../utils/createRoute';
+import { makeUniqueRoutes } from '../../utils/makeUniqueRoutes';
 import AuthPage from '../AuthPage';
-import NotFoundPage from '../NotFoundPage';
-import UseCasePage from '../UseCasePage';
+import { NotFoundPage } from '../NotFoundPage';
+import { UseCasePage } from '../UseCasePage';
 
 import { ROUTES_CE, SET_ADMIN_PERMISSIONS } from './constants';
 
 const AuthenticatedApp = lazy(() =>
-  import(/* webpackChunkName: "Admin-authenticatedApp" */ '../../components/AuthenticatedApp')
+  import(/* webpackChunkName: "Admin-authenticatedApp" */ '../../components/AuthenticatedApp').then(
+    (mod) => ({ default: mod.AuthenticatedApp })
+  )
 );
 
 function App() {

package/admin/src/pages/App/selectors.js

@@ -1,4 +1,4 @@
-import { createSelector } from 'reselect';
+import { createSelector } from '@reduxjs/toolkit';
 
 import { initialState } from './reducer';
 

package/admin/src/pages/AuthPage/components/ForgotPassword/index.js

@@ -7,9 +7,10 @@ import PropTypes from 'prop-types';
 import { useIntl } from 'react-intl';
 
 import { Logo } from '../../../../components/UnauthenticatedLogo';
-import UnauthenticatedLayout, {
+import {
   Column,
   LayoutContent,
+  UnauthenticatedLayout,
 } from '../../../../layouts/UnauthenticatedLayout';
 
 const ForgotPassword = ({ onSubmit, schema }) => {

package/admin/src/pages/AuthPage/components/ForgotPasswordSuccess/index.js

@@ -5,9 +5,10 @@ import { Link } from '@strapi/helper-plugin';
 import { useIntl } from 'react-intl';
 
 import { Logo } from '../../../../components/UnauthenticatedLogo';
-import UnauthenticatedLayout, {
+import {
   Column,
   LayoutContent,
+  UnauthenticatedLayout,
 } from '../../../../layouts/UnauthenticatedLayout';
 
 const ForgotPasswordSuccess = () => {

package/admin/src/pages/AuthPage/components/Login/index.js

@@ -2,7 +2,7 @@ import React from 'react';
 
 import PropTypes from 'prop-types';
 
-import UnauthenticatedLayout from '../../../../layouts/UnauthenticatedLayout';
+import { UnauthenticatedLayout } from '../../../../layouts/UnauthenticatedLayout';
 
 import BaseLogin from './BaseLogin';
 

package/admin/src/pages/AuthPage/components/Oops/index.js

@@ -5,9 +5,10 @@ import { Link, useQuery } from '@strapi/helper-plugin';
 import { useIntl } from 'react-intl';
 
 import { Logo } from '../../../../components/UnauthenticatedLogo';
-import UnauthenticatedLayout, {
+import {
   Column,
   LayoutContent,
+  UnauthenticatedLayout,
 } from '../../../../layouts/UnauthenticatedLayout';
 
 const Oops = () => {

package/admin/src/pages/AuthPage/components/Register/index.js

@@ -32,7 +32,7 @@ import styled from 'styled-components';
 
 import { useNpsSurveySettings } from '../../../../components/NpsSurvey';
 import { Logo } from '../../../../components/UnauthenticatedLogo';
-import UnauthenticatedLayout, { LayoutContent } from '../../../../layouts/UnauthenticatedLayout';
+import { LayoutContent, UnauthenticatedLayout } from '../../../../layouts/UnauthenticatedLayout';
 import FieldActionWrapper from '../FieldActionWrapper';
 
 const A = styled.a`

package/admin/src/pages/AuthPage/components/ResetPassword/index.js

@@ -9,9 +9,10 @@ import { useIntl } from 'react-intl';
 import styled from 'styled-components';
 
 import { Logo } from '../../../../components/UnauthenticatedLogo';
-import UnauthenticatedLayout, {
+import {
   Column,
   LayoutContent,
+  UnauthenticatedLayout,
 } from '../../../../layouts/UnauthenticatedLayout';
 import FieldActionWrapper from '../FieldActionWrapper';
 

package/admin/src/pages/AuthPage/index.js

@@ -8,10 +8,9 @@ import omit from 'lodash/omit';
 import PropTypes from 'prop-types';
 import { Redirect, useHistory, useRouteMatch } from 'react-router-dom';
 
-import persistStateToLocaleStorage from '../../components/GuidedTour/utils/persistStateToLocaleStorage';
 import { useLocales } from '../../components/LanguageProvider';
 import { useEnterprise } from '../../hooks/useEnterprise';
-import formatAPIErrors from '../../utils/formatAPIErrors';
+import { formatAPIErrors} from '../../utils/formatAPIErrors';
 
 import { LoginCE } from './components/Login';
 import { FORMS } from './constants';
@@ -181,7 +180,7 @@ const AuthPage = ({ hasAdmin, setHasAdmin }) => {
         const isUserSuperAdmin = roles.find(({ code }) => code === 'strapi-super-admin');
 
         if (isUserSuperAdmin) {
-          persistStateToLocaleStorage.setSkipped(false);
+          auth.set(false, 'GUIDED_TOUR_SKIPPED', true);
           setSkipped(false);
           trackUsage('didLaunchGuidedtour');
         }

package/admin/src/pages/HomePage/index.js

@@ -12,8 +12,7 @@ import { FormattedMessage } from 'react-intl';
 import { useHistory } from 'react-router-dom';
 import styled from 'styled-components';
 
-import GuidedTourHomepage from '../../components/GuidedTour/Homepage';
-import isGuidedTourCompleted from '../../components/GuidedTour/utils/isGuidedTourCompleted';
+import { GuidedTourHomepage } from '../../components/GuidedTour/Homepage';
 import { useContentTypes } from '../../hooks/useContentTypes';
 import { useEnterprise } from '../../hooks/useEnterprise';
 
@@ -37,7 +36,11 @@ export const HomePageCE = () => {
   const { collectionTypes, singleTypes, isLoading: isLoadingForModels } = useContentTypes();
   const { guidedTourState, isGuidedTourVisible, isSkipped } = useGuidedTour();
   const showGuidedTour =
-    !isGuidedTourCompleted(guidedTourState) && isGuidedTourVisible && !isSkipped;
+    !Object.values(guidedTourState).every((section) =>
+      Object.values(section).every((step) => step)
+    ) &&
+    isGuidedTourVisible &&
+    !isSkipped;
   const { push } = useHistory();
   const handleClick = (e) => {
     e.preventDefault();

package/admin/src/pages/{InternalErrorPage/index.js → InternalErrorPage.tsx}

@@ -4,15 +4,21 @@
  * This is the page we show when the user gets a 500 error
  *
  */
-import React from 'react';
 
-import { ContentLayout, EmptyStateLayout, HeaderLayout, Main } from '@strapi/design-system';
-import { LinkButton, useFocusWhenNavigate } from '@strapi/helper-plugin';
+import {
+  ContentLayout,
+  EmptyStateLayout,
+  HeaderLayout,
+  LinkButton,
+  Main,
+} from '@strapi/design-system';
+import { useFocusWhenNavigate } from '@strapi/helper-plugin';
 import { ArrowRight, EmptyPictures } from '@strapi/icons';
 import { useIntl } from 'react-intl';
 
-const InternalErrorPage = () => {
+export const InternalErrorPage = () => {
   const { formatMessage } = useIntl();
+
   useFocusWhenNavigate();
 
   return (
@@ -46,5 +52,3 @@ const InternalErrorPage = () => {
     </Main>
   );
 };
-
-export default InternalErrorPage;

package/admin/src/pages/{NotFoundPage/index.js → NotFoundPage.tsx}

@@ -4,14 +4,18 @@
  * This is the page we show when the user visits a url that doesn't have a route
  *
  */
-import React from 'react';
-
-import { ContentLayout, EmptyStateLayout, HeaderLayout, Main } from '@strapi/design-system';
-import { LinkButton, useFocusWhenNavigate } from '@strapi/helper-plugin';
+import {
+  ContentLayout,
+  EmptyStateLayout,
+  HeaderLayout,
+  LinkButton,
+  Main,
+} from '@strapi/design-system';
+import { useFocusWhenNavigate } from '@strapi/helper-plugin';
 import { ArrowRight, EmptyPictures } from '@strapi/icons';
 import { useIntl } from 'react-intl';
 
-const NoContentType = () => {
+export const NotFoundPage = () => {
   const { formatMessage } = useIntl();
   useFocusWhenNavigate();
 
@@ -46,5 +50,3 @@ const NoContentType = () => {
     </Main>
   );
 };
-
-export default NoContentType;

package/admin/src/pages/ProfilePage/components/Preferences/index.js

@@ -1,6 +1,14 @@
 import React from 'react';
 
-import { Box, Flex, Grid, GridItem, Option, Select, Typography } from '@strapi/design-system';
+import {
+  Box,
+  Flex,
+  Grid,
+  GridItem,
+  SingleSelect,
+  SingleSelectOption,
+  Typography,
+} from '@strapi/design-system';
 import upperFirst from 'lodash/upperFirst';
 import PropTypes from 'prop-types';
 import { useIntl } from 'react-intl';
@@ -57,7 +65,7 @@ const Preferences = ({ onChange, values, localeNames, allApplicationThemes }) =>
         </Flex>
         <Grid gap={5}>
           <GridItem s={12} col={6}>
-            <Select
+            <SingleSelect
               label={formatMessage({
                 id: 'Settings.profile.form.section.experience.interfaceLanguage',
                 defaultMessage: 'Interface language',
@@ -87,14 +95,14 @@ const Preferences = ({ onChange, values, localeNames, allApplicationThemes }) =>
               }}
             >
               {Object.entries(localeNames).map(([language, langName]) => (
-                <Option value={language} key={language}>
+                <SingleSelectOption value={language} key={language}>
                   {langName}
-                </Option>
+                </SingleSelectOption>
               ))}
-            </Select>
+            </SingleSelect>
           </GridItem>
           <GridItem s={12} col={6}>
-            <Select
+            <SingleSelect
               label={formatMessage({
                 id: 'Settings.profile.form.section.experience.mode.label',
                 defaultMessage: 'Interface mode',
@@ -114,8 +122,14 @@ const Preferences = ({ onChange, values, localeNames, allApplicationThemes }) =>
                 });
               }}
             >
+              <SingleSelectOption value="system">
+                {formatMessage({
+                  id: 'Settings.profile.form.section.experience.mode.option-system-label',
+                  defaultMessage: 'Use system settings',
+                })}
+              </SingleSelectOption>
               {themesToDisplay.map((theme) => (
-                <Option value={theme} key={theme}>
+                <SingleSelectOption value={theme} key={theme}>
                   {formatMessage(
                     {
                       id: 'Settings.profile.form.section.experience.mode.option-label',
@@ -128,9 +142,9 @@ const Preferences = ({ onChange, values, localeNames, allApplicationThemes }) =>
                       }),
                     }
                   )}
-                </Option>
+                </SingleSelectOption>
               ))}
-            </Select>
+            </SingleSelect>
           </GridItem>
         </Grid>
       </Flex>

package/admin/src/pages/ProfilePage/index.js

@@ -28,7 +28,7 @@ import { useMutation, useQuery, useQueryClient } from 'react-query';
 
 import { useLocales } from '../../components/LanguageProvider';
 import { useThemeToggle } from '../../hooks/useThemeToggle';
-import { getFullName } from '../../utils';
+import { getFullName } from '../../utils/getFullName';
 
 import Password from './components/Password';
 import Preferences from './components/Preferences';

package/admin/src/pages/SettingsPage/components/SettingsNav/index.js

@@ -1,5 +1,6 @@
 import React from 'react';
 
+import { Icon } from '@strapi/design-system';
 import {
   SubNav,
   SubNavHeader,
@@ -8,9 +9,21 @@ import {
   SubNavSections,
 } from '@strapi/design-system/v2';
 import { useTracking } from '@strapi/helper-plugin';
+import { Lock } from '@strapi/icons';
 import PropTypes from 'prop-types';
 import { useIntl } from 'react-intl';
 import { NavLink, useLocation } from 'react-router-dom';
+import styled from 'styled-components';
+
+/**
+ * TODO: refactor the SubNav entirely, we shouldn't have
+ * to do this hack to work a lock at the end. It's a bit hacky.
+ */
+
+const CustomIcon = styled(Icon)`
+  right: 15px;
+  position: absolute;
+`;
 
 const SettingsNav = ({ menu }) => {
   const { formatMessage } = useIntl();
@@ -60,6 +73,13 @@ const SettingsNav = ({ menu }) => {
                   key={link.id}
                 >
                   {formatMessage(link.intlLabel)}
+                  {link?.lockIcon && (
+                    <CustomIcon
+                      width={`${15 / 16}rem`}
+                      height={`${15 / 16}rem`}
+                      as={Lock}
+                    />
+                  )}
                 </SubNavLink>
               );
             })}

package/admin/src/pages/SettingsPage/constants.js

@@ -164,4 +164,37 @@ export const ROUTES_CE = [
     to: '/settings/transfer-tokens/:id',
     exact: true,
   },
+  {
+    async Component() {
+      const component = await import(
+        /* webpackChunkName: "audit-logs-sales-page" */ './pages/AuditLogs/SalesPage'
+      );
+
+      return component;
+    },
+    to: '/settings/purchase-audit-logs',
+    exact: true,
+  },
+  {
+    async Component() {
+      const component = await import(
+        /* webpackChunkName: "review-workflows-sales-page" */ './pages/ReviewWorkflows/SalesPage'
+      );
+
+      return component;
+    },
+    to: '/settings/purchase-review-workflows',
+    exact: true,
+  },
+  {
+    async Component() {
+      const component = await import(
+        /* webpackChunkName: "sso-sales-page" */ './pages/SingleSignOn/SalesPage'
+      );
+
+      return component;
+    },
+    to: '/settings/purchase-single-sign-on',
+    exact: true,
+  },
 ];

package/admin/src/pages/SettingsPage/index.js

@@ -8,8 +8,8 @@ import { Redirect, Route, Switch, useParams } from 'react-router-dom';
 
 import { useSettingsMenu } from '../../hooks';
 import { useEnterprise } from '../../hooks/useEnterprise';
-import createRoute from '../../utils/createRoute';
-import makeUniqueRoutes from '../../utils/makeUniqueRoutes';
+import { createRoute } from '../../utils/createRoute';
+import { makeUniqueRoutes } from '../../utils/makeUniqueRoutes';
 
 import SettingsNav from './components/SettingsNav';
 import { ROUTES_CE } from './constants';

package/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/components/ActionBoundRoutes/index.js

@@ -3,7 +3,7 @@ import React from 'react';
 import { Flex, GridItem, Typography } from '@strapi/design-system';
 import { useIntl } from 'react-intl';
 
-import { useApiTokenPermissionsContext } from '../../../../../../../contexts/ApiTokenPermissions';
+import { useApiTokenPermissionsContext } from '../../../../../../../contexts/apiTokenPermissions';
 import BoundRoute from '../BoundRoute';
 
 const ActionBoundRoutes = () => {

package/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/components/CollapsableContentType/index.js

@@ -17,7 +17,7 @@ import PropTypes from 'prop-types';
 import { useIntl } from 'react-intl';
 import styled from 'styled-components';
 
-import { useApiTokenPermissionsContext } from '../../../../../../../contexts/ApiTokenPermissions';
+import { useApiTokenPermissionsContext } from '../../../../../../../contexts/apiTokenPermissions';
 
 import CheckboxWrapper from './CheckBoxWrapper';
 

package/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/components/Permissions/index.js

@@ -3,7 +3,7 @@ import React, { memo } from 'react';
 import { Flex, Grid, GridItem, Typography } from '@strapi/design-system';
 import { useIntl } from 'react-intl';
 
-import { useApiTokenPermissionsContext } from '../../../../../../../contexts/ApiTokenPermissions';
+import { useApiTokenPermissionsContext } from '../../../../../../../contexts/apiTokenPermissions';
 import ActionBoundRoutes from '../ActionBoundRoutes';
 import ContentTypesSection from '../ContenTypesSection';
 

package/admin/src/pages/SettingsPage/pages/ApiTokens/EditView/index.js

@@ -18,8 +18,8 @@ import { useQuery } from 'react-query';
 import { useSelector } from 'react-redux';
 import { useHistory, useRouteMatch } from 'react-router-dom';
 
-import { ApiTokenPermissionsContextProvider } from '../../../../../contexts/ApiTokenPermissions';
-import { formatAPIErrors } from '../../../../../utils';
+import { ApiTokenPermissionsContextProvider } from '../../../../../contexts/apiTokenPermissions';
+import { formatAPIErrors } from '../../../../../utils/formatAPIErrors';
 import { selectAdminPermissions } from '../../../../App/selectors';
 import { API_TOKEN_TYPE } from '../../../components/Tokens/constants';
 import FormHead from '../../../components/Tokens/FormHead';

package/admin/src/pages/SettingsPage/pages/AuditLogs/SalesPage.js

@@ -0,0 +1,50 @@
+import React from 'react';
+
+import { Box, Layout, Main, HeaderLayout, EmptyStateLayout } from '@strapi/design-system';
+import { LinkButton } from '@strapi/design-system/v2';
+import { ExternalLink, EmptyPermissions } from '@strapi/icons';
+import { useIntl } from 'react-intl';
+
+const SalesPage = () => {
+  const { formatMessage } = useIntl();
+
+  return (
+    <Layout>
+      <Main>
+        <HeaderLayout
+          title={formatMessage({ id: 'global.auditLogs', defaultMessage: 'Audit Logs' })}
+          subtitle={formatMessage({
+            id: 'Settings.permissions.auditLogs.listview.header.subtitle',
+            defaultMessage: 'Logs of all the activities that happened in your environment',
+          })}
+        />
+        <Box paddingLeft={10} paddingRight={10}>
+          <EmptyStateLayout
+            icon={<EmptyPermissions width="10rem" />}
+            content={formatMessage({
+              id: 'Settings.permissions.auditLogs.not-available',
+              defaultMessage:
+                'Audit Logs is only available as part of the Enterprise Edition. Upgrade to get a searchable and filterable display of all activities.',
+            })}
+            action={
+              <LinkButton
+                variant="default"
+                endIcon={<ExternalLink />}
+                href="https://strp.cc/45mbAdF"
+                isExternal
+                target="_blank"
+              >
+                {formatMessage({
+                  id: 'global.learn-more',
+                  defaultMessage: 'Learn more',
+                })}
+              </LinkButton>
+            }
+          />
+        </Box>
+      </Main>
+    </Layout>
+  );
+};
+
+export default SalesPage;

package/admin/src/pages/SettingsPage/pages/ReviewWorkflows/SalesPage.js

@@ -0,0 +1,53 @@
+import React from 'react';
+
+import { Box, Layout, Main, HeaderLayout, EmptyStateLayout } from '@strapi/design-system';
+import { LinkButton } from '@strapi/design-system/v2';
+import { ExternalLink, EmptyPermissions } from '@strapi/icons';
+import { useIntl } from 'react-intl';
+
+const SalesPage = () => {
+  const { formatMessage } = useIntl();
+
+  return (
+    <Layout>
+      <Main>
+        <HeaderLayout
+          title={formatMessage({
+            id: 'Settings.review-workflows.list.page.title',
+            defaultMessage: 'Review Workflows',
+          })}
+          subtitle={formatMessage({
+            id: 'Settings.review-workflows.list.page.subtitle',
+            defaultMessage: 'Manage your content review process',
+          })}
+        />
+        <Box paddingLeft={10} paddingRight={10}>
+          <EmptyStateLayout
+            icon={<EmptyPermissions width="10rem" />}
+            content={formatMessage({
+              id: 'Settings.review-workflows.not-available',
+              defaultMessage:
+                'Review Workflows is only available as part of the Enterprise Edition. Upgrade to create and manage workflows.',
+            })}
+            action={
+              <LinkButton
+                variant="default"
+                endIcon={<ExternalLink />}
+                href="https://strp.cc/3tdNfJqe"
+                isExternal
+                target="_blank"
+              >
+                {formatMessage({
+                  id: 'global.learn-more',
+                  defaultMessage: 'Learn more',
+                })}
+              </LinkButton>
+            }
+          />
+        </Box>
+      </Main>
+    </Layout>
+  );
+};
+
+export default SalesPage;

package/admin/src/pages/SettingsPage/pages/SingleSignOn/SalesPage.js

@@ -0,0 +1,53 @@
+import React from 'react';
+
+import { Box, Layout, Main, HeaderLayout, EmptyStateLayout } from '@strapi/design-system';
+import { LinkButton } from '@strapi/design-system/v2';
+import { ExternalLink, EmptyPermissions } from '@strapi/icons';
+import { useIntl } from 'react-intl';
+
+const SalesPage = () => {
+  const { formatMessage } = useIntl();
+
+  return (
+    <Layout>
+      <Main>
+        <HeaderLayout
+          title={formatMessage({
+            id: 'Settings.sso.title',
+            defaultMessage: 'Single Sign-On',
+          })}
+          subtitle={formatMessage({
+            id: 'Settings.sso.subTitle',
+            defaultMessage: 'Configure the settings for the Single Sign-On feature.',
+          })}
+        />
+        <Box paddingLeft={10} paddingRight={10}>
+          <EmptyStateLayout
+            icon={<EmptyPermissions width="10rem" />}
+            content={formatMessage({
+              id: 'Settings.sso.not-available',
+              defaultMessage:
+                'SSO is only available as part of the Enterprise Edition. Upgrade to configure additional sign-in & sign-up methods for your administration panel.',
+            })}
+            action={
+              <LinkButton
+                variant="default"
+                endIcon={<ExternalLink />}
+                href="https://strp.cc/46Fk1BA"
+                isExternal
+                target="_blank"
+              >
+                {formatMessage({
+                  id: 'global.learn-more',
+                  defaultMessage: 'Learn more',
+                })}
+              </LinkButton>
+            }
+          />
+        </Box>
+      </Main>
+    </Layout>
+  );
+};
+
+export default SalesPage;

package/admin/src/pages/SettingsPage/pages/TransferTokens/EditView/index.js

@@ -19,7 +19,7 @@ import { useQuery } from 'react-query';
 import { useSelector } from 'react-redux';
 import { useHistory, useRouteMatch } from 'react-router-dom';
 
-import { formatAPIErrors } from '../../../../../utils';
+import { formatAPIErrors } from '../../../../../utils/formatAPIErrors';
 import { selectAdminPermissions } from '../../../../App/selectors';
 import { TRANSFER_TOKEN_TYPE } from '../../../components/Tokens/constants';
 import FormHead from '../../../components/Tokens/FormHead';

package/admin/src/pages/SettingsPage/pages/Users/EditPage/index.js

@@ -34,7 +34,8 @@ import { useHistory, useRouteMatch } from 'react-router-dom';
 
 import { useAdminUsers } from '../../../../../hooks/useAdminUsers';
 import { useEnterprise } from '../../../../../hooks/useEnterprise';
-import { formatAPIErrors, getFullName } from '../../../../../utils';
+import { formatAPIErrors } from '../../../../../utils/formatAPIErrors';
+import { getFullName } from '../../../../../utils/getFullName';
 import { MagicLinkCE } from '../components/MagicLink';
 import SelectRoles from '../components/SelectRoles';
 import { editValidation } from '../utils/validations/users';

package/admin/src/pages/SettingsPage/pages/Users/ListPage/DynamicTable/TableRows/index.js

@@ -16,7 +16,7 @@ import PropTypes from 'prop-types';
 import { useIntl } from 'react-intl';
 import { useHistory } from 'react-router-dom';
 
-import { getFullName } from '../../../../../../../utils';
+import { getFullName } from '../../../../../../../utils/getFullName';
 
 const TableRows = ({
   canDelete,