@strapi/admin 4.1.10-beta.0 → 4.1.10

package/admin/src/components/AutoReloadOverlayBlockerProvider/Blocker.js

@@ -6,7 +6,7 @@ import styled, { keyframes } from 'styled-components';
 import { pxToRem } from '@strapi/helper-plugin';
 import Clock from '@strapi/icons/Clock';
 import Refresh from '@strapi/icons/Refresh';
-import { Link } from '@strapi/design-system/Link';
+import { Link } from '@strapi/design-system/v2/Link';
 import { Box } from '@strapi/design-system/Box';
 import { Stack } from '@strapi/design-system/Stack';
 import { Flex } from '@strapi/design-system/Flex';
@@ -72,11 +72,7 @@ const Blocker = ({ displayedIcon, description, title, isOpen }) => {
           </Flex>
           <Flex justifyContent="center">
             <Box paddingTop={2}>
-              <Link
-                href="https://docs.strapi.io"
-                target="_blank"
-                rel="noopener noreferrer nofollow"
-              >
+              <Link href="https://docs.strapi.io" isExternal>
                 {formatMessage({
                   id: 'global.documentation',
                   defaultMessage: 'Read the documentation',

package/admin/src/components/GuidedTour/Homepage/index.js

@@ -1,11 +1,10 @@
 import React from 'react';
-import { useGuidedTour, useTracking } from '@strapi/helper-plugin';
+import { useGuidedTour, useTracking, LinkButton } from '@strapi/helper-plugin';
 import { useIntl } from 'react-intl';
 import { Stack } from '@strapi/design-system/Stack';
 import { Flex } from '@strapi/design-system/Flex';
 import { Box } from '@strapi/design-system/Box';
 import { Typography } from '@strapi/design-system/Typography';
-import { LinkButton } from '@strapi/design-system/LinkButton';
 import { Button } from '@strapi/design-system/Button';
 import ArrowRight from '@strapi/icons/ArrowRight';
 import StepperHomepage from './components/Stepper';

package/admin/src/components/GuidedTour/Modal/components/Stepper.js

@@ -1,10 +1,9 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { useIntl } from 'react-intl';
-import { pxToRem } from '@strapi/helper-plugin';
+import { pxToRem, LinkButton } from '@strapi/helper-plugin';
 import { Typography } from '@strapi/design-system/Typography';
 import { Button } from '@strapi/design-system/Button';
-import { LinkButton } from '@strapi/design-system/LinkButton';
 import { Box } from '@strapi/design-system/Box';
 import { Flex } from '@strapi/design-system/Flex';
 import ArrowRight from '@strapi/icons/ArrowRight';

package/admin/src/components/LeftMenu/index.js

@@ -2,7 +2,7 @@ import React, { useRef, useState } from 'react';
 import styled from 'styled-components';
 import PropTypes from 'prop-types';
 import { useIntl } from 'react-intl';
-import { NavLink as Link } from 'react-router-dom';
+import { NavLink as RouterNavLink } from 'react-router-dom';
 import { Divider } from '@strapi/design-system/Divider';
 import {
   MainNav,
@@ -12,7 +12,7 @@ import {
   NavSection,
   NavUser,
   NavCondense,
-} from '@strapi/design-system/MainNav';
+} from '@strapi/design-system/v2/MainNav';
 import { FocusTrap } from '@strapi/design-system/FocusTrap';
 import { Box } from '@strapi/design-system/Box';
 import { Typography } from '@strapi/design-system/Typography';
@@ -29,7 +29,7 @@ const LinkUserWrapper = styled(Box)`
   left: ${({ theme }) => theme.spaces[5]};
 `;
 
-const LinkUser = styled(Link)`
+const LinkUser = styled(RouterNavLink)`
   display: flex;
   justify-content: space-between;
   align-items: center;
@@ -53,9 +53,7 @@ const LinkUser = styled(Link)`
 const LeftMenu = ({ generalSectionLinks, pluginsSectionLinks }) => {
   const buttonRef = useRef();
   const [userLinksVisible, setUserLinksVisible] = useState(false);
-  const {
-    logos: { menu },
-  } = useConfigurations();
+  const { menuLogo } = useConfigurations();
   const [condensed, setCondensed] = usePersistentState('navbar-condensed', false);
   const { userDisplayName } = useAppInfos();
   const { formatMessage } = useIntl();
@@ -90,18 +88,19 @@ const LeftMenu = ({ generalSectionLinks, pluginsSectionLinks }) => {
   return (
     <MainNav condensed={condensed}>
       <NavBrand
+        as={RouterNavLink}
         workplace={formatMessage({
           id: 'app.components.LeftMenu.navbrand.workplace',
           defaultMessage: 'Workplace',
         })}
         title={menuTitle}
-        icon={<img src={menu.custom || menu.default} alt={menuTitle} />}
+        icon={<img src={menuLogo} alt={menuTitle} />}
       />
 
       <Divider />
 
       <NavSections>
-        <NavLink to="/content-manager" icon={<Write />}>
+        <NavLink as={RouterNavLink} to="/content-manager" icon={<Write />}>
           {formatMessage({ id: 'global.content-manager', defaultMessage: 'Content manager' })}
         </NavLink>
 
@@ -111,7 +110,7 @@ const LeftMenu = ({ generalSectionLinks, pluginsSectionLinks }) => {
               const Icon = link.icon;
 
               return (
-                <NavLink to={link.to} key={link.to} icon={<Icon />}>
+                <NavLink as={RouterNavLink} to={link.to} key={link.to} icon={<Icon />}>
                   {formatMessage(link.intlLabel)}
                 </NavLink>
               );
@@ -126,6 +125,7 @@ const LeftMenu = ({ generalSectionLinks, pluginsSectionLinks }) => {
 
               return (
                 <NavLink
+                  as={RouterNavLink}
                   badgeContent={
                     (link.notificationsCount > 0 && link.notificationsCount.toString()) || undefined
                   }

package/admin/src/components/Notifications/Notification/index.js

@@ -2,7 +2,7 @@ import React, { useEffect, useCallback } from 'react';
 import PropTypes from 'prop-types';
 import { useIntl } from 'react-intl';
 import { Alert } from '@strapi/design-system/Alert';
-import { Link } from '@strapi/design-system/Link';
+import { Link } from '@strapi/design-system/v2/Link';
 
 const Notification = ({ dispatch, notification }) => {
   const { formatMessage } = useIntl();
@@ -60,7 +60,7 @@ const Notification = ({ dispatch, notification }) => {
     <Alert
       action={
         link ? (
-          <Link href={link.url} target="_blank">
+          <Link href={link.url} isExternal>
             {formatMessage({
               id: link.label?.id || link.label,
               defaultMessage: link.label?.defaultMessage || link.label?.id || link.label,

package/admin/src/components/Providers/index.js

@@ -3,8 +3,7 @@ import PropTypes from 'prop-types';
 import { QueryClientProvider, QueryClient } from 'react-query';
 import { LibraryProvider, StrapiAppProvider } from '@strapi/helper-plugin';
 import { Provider } from 'react-redux';
-import { AdminContext } from '../../contexts';
-import ConfigurationsProvider from '../ConfigurationsProvider';
+import { AdminContext, ConfigurationsContext } from '../../contexts';
 import LanguageProvider from '../LanguageProvider';
 import GuidedTour from '../GuidedTour';
 import AutoReloadOverlayBlockerProvider from '../AutoReloadOverlayBlockerProvider';
@@ -48,11 +47,8 @@ const Providers = ({
         <QueryClientProvider client={queryClient}>
           <Provider store={store}>
             <AdminContext.Provider value={{ getAdminInjectedComponents }}>
-              <ConfigurationsProvider
-                authLogo={authLogo}
-                menuLogo={menuLogo}
-                showReleaseNotification={showReleaseNotification}
-                showTutorials={showTutorials}
+              <ConfigurationsContext.Provider
+                value={{ authLogo, menuLogo, showReleaseNotification, showTutorials }}
               >
                 <StrapiAppProvider
                   getPlugin={getPlugin}
@@ -75,7 +71,7 @@ const Providers = ({
                     </LanguageProvider>
                   </LibraryProvider>
                 </StrapiAppProvider>
-              </ConfigurationsProvider>
+              </ConfigurationsContext.Provider>
             </AdminContext.Provider>
           </Provider>
         </QueryClientProvider>

package/admin/src/components/UnauthenticatedLogo/index.js

@@ -7,11 +7,9 @@ const Img = styled.img`
 `;
 
 const Logo = () => {
-  const {
-    logos: { auth },
-  } = useConfigurations();
+  const { authLogo } = useConfigurations();
 
-  return <Img src={auth.default} aria-hidden alt="" />;
+  return <Img src={authLogo} aria-hidden alt="" />;
 };
 
 export default Logo;

package/admin/src/components/UpgradePlanModal/index.js

@@ -5,7 +5,7 @@ import { useIntl } from 'react-intl';
 import { Portal } from '@strapi/design-system/Portal';
 import { FocusTrap } from '@strapi/design-system/FocusTrap';
 import { IconButton } from '@strapi/design-system/IconButton';
-import { LinkButton } from '@strapi/design-system/LinkButton';
+import { LinkButton } from '@strapi/design-system/v2/LinkButton';
 import { Box } from '@strapi/design-system/Box';
 import { Flex } from '@strapi/design-system/Flex';
 import { Typography } from '@strapi/design-system/Typography';
@@ -104,7 +104,11 @@ const UpgradePlanModal = ({ onClose, isOpen }) => {
                   })}
                 </Typography>
               </Stack>
-              <LinkButton href="https://strapi.io/pricing-self-hosted" endIcon={<ExternalLink />}>
+              <LinkButton
+                href="https://strapi.io/pricing-self-hosted"
+                isExternal
+                endIcon={<ExternalLink />}
+              >
                 {formatMessage({
                   id: 'app.components.UpgradePlanModal.button',
                   defaultMessage: 'Learn more',

package/admin/src/content-manager/components/SelectMany/ListItem.js

@@ -1,7 +1,7 @@
 import React, { memo } from 'react';
 import PropTypes from 'prop-types';
 import styled from 'styled-components';
-import { pxToRem, RemoveRoundedButton } from '@strapi/helper-plugin';
+import { pxToRem, RemoveRoundedButton, Link } from '@strapi/helper-plugin';
 import { useIntl } from 'react-intl';
 import { useLocation } from 'react-router-dom';
 import has from 'lodash/has';
@@ -9,7 +9,6 @@ import isEmpty from 'lodash/isEmpty';
 import { Box } from '@strapi/design-system/Box';
 import { Flex } from '@strapi/design-system/Flex';
 import { Typography } from '@strapi/design-system/Typography';
-import { Link } from '@strapi/design-system/Link';
 import { getTrad } from '../../utils';
 
 const StyledBullet = styled.div`

package/admin/src/content-manager/components/SelectWrapper/index.js

@@ -1,21 +1,22 @@
 import React, { useCallback, useState, useEffect, useMemo, memo } from 'react';
 import PropTypes from 'prop-types';
-import {
-  // FormattedMessage,
-  useIntl,
-} from 'react-intl';
+import { useIntl } from 'react-intl';
 import { useLocation } from 'react-router-dom';
-import { Link } from '@strapi/design-system/Link';
-import { Stack } from '@strapi/design-system/Stack';
 import { useTheme } from 'styled-components';
 import findIndex from 'lodash/findIndex';
 import get from 'lodash/get';
 import isArray from 'lodash/isArray';
 import isEmpty from 'lodash/isEmpty';
 import set from 'lodash/set';
-import { NotAllowedInput, useCMEditViewDataManager, useQueryParams } from '@strapi/helper-plugin';
+import {
+  NotAllowedInput,
+  useCMEditViewDataManager,
+  useQueryParams,
+  Link,
+} from '@strapi/helper-plugin';
 import { stringify } from 'qs';
 import axios from 'axios';
+import { Stack } from '@strapi/design-system/Stack';
 import { axiosInstance } from '../../../core/utils';
 import { getTrad } from '../../utils';
 import Label from './Label';

package/admin/src/content-manager/components/SingleTypeFormWrapper/index.js

@@ -143,8 +143,8 @@ const SingleTypeFormWrapper = ({ allLayoutData, children, slug }) => {
 
   const displayErrors = useCallback(
     err => {
-      const errorPayload = err.response.payload;
-      let errorMessage = get(errorPayload, ['message'], 'Bad Request');
+      const errorPayload = err.response.data;
+      let errorMessage = get(errorPayload, ['error', 'message'], 'Bad Request');
 
       // TODO handle errors correctly when back-end ready
       if (Array.isArray(errorMessage)) {

package/admin/src/content-manager/components/Wysiwyg/Editor.js

@@ -32,6 +32,8 @@ const Editor = ({
       readOnly: false,
       smartIndent: false,
       placeholder,
+      spellcheck: true,
+      inputStyle: 'contenteditable',
     });
 
     CodeMirror.commands.newlineAndIndentContinueMarkdownList = newlineAndIndentContinueMarkdownList;

package/admin/src/content-manager/pages/App/LeftMenu/index.js

@@ -5,18 +5,19 @@
  */
 
 import React, { useMemo, useState } from 'react';
+import { useSelector, shallowEqual } from 'react-redux';
+import { useIntl } from 'react-intl';
+import matchSorter from 'match-sorter';
+import sortBy from 'lodash/sortBy';
+import toLower from 'lodash/toLower';
+import { NavLink } from 'react-router-dom';
 import {
   SubNav,
   SubNavHeader,
   SubNavSection,
   SubNavSections,
   SubNavLink,
-} from '@strapi/design-system/SubNav';
-import { useSelector, shallowEqual } from 'react-redux';
-import { useIntl } from 'react-intl';
-import matchSorter from 'match-sorter';
-import sortBy from 'lodash/sortBy';
-import toLower from 'lodash/toLower';
+} from '@strapi/design-system/v2/SubNav';
 import getTrad from '../../../utils/getTrad';
 import { makeSelectModelLinks } from '../selectors';
 
@@ -111,7 +112,7 @@ const LeftMenu = () => {
                 const search = link.search ? `?${link.search}` : '';
 
                 return (
-                  <SubNavLink key={link.uid} to={`${link.to}${search}`}>
+                  <SubNavLink as={NavLink} key={link.uid} to={`${link.to}${search}`}>
                     {link.title}
                   </SubNavLink>
                 );

package/admin/src/content-manager/pages/EditSettingsView/components/ComponentFieldList.js

@@ -1,8 +1,8 @@
 import React from 'react';
 import PropTypes from 'prop-types';
+import { Link } from '@strapi/helper-plugin';
 import { Box } from '@strapi/design-system/Box';
 import { Flex } from '@strapi/design-system/Flex';
-import { Link } from '@strapi/design-system/Link';
 import { Typography } from '@strapi/design-system/Typography';
 import Cog from '@strapi/icons/Cog';
 import { useIntl } from 'react-intl';

package/admin/src/content-manager/pages/EditSettingsView/components/LinkToCTB.js

@@ -5,10 +5,9 @@
  */
 
 import React from 'react';
-import { useTracking, CheckPermissions } from '@strapi/helper-plugin';
+import { useTracking, CheckPermissions, LinkButton } from '@strapi/helper-plugin';
 import { useIntl } from 'react-intl';
 import get from 'lodash/get';
-import { LinkButton } from '@strapi/design-system/LinkButton';
 import Pencil from '@strapi/icons/Pencil';
 import getTrad from '../../../utils/getTrad';
 import useLayoutDnd from '../../../hooks/useLayoutDnd';

package/admin/src/content-manager/pages/EditSettingsView/index.js

@@ -9,11 +9,10 @@ import flatMap from 'lodash/flatMap';
 import isEqual from 'lodash/isEqual';
 import get from 'lodash/get';
 import set from 'lodash/set';
-import { useNotification, useTracking, ConfirmDialog } from '@strapi/helper-plugin';
+import { useNotification, useTracking, ConfirmDialog, Link } from '@strapi/helper-plugin';
 import { useHistory } from 'react-router-dom';
 import { Main } from '@strapi/design-system/Main';
 import { HeaderLayout, ContentLayout } from '@strapi/design-system/Layout';
-import { Link } from '@strapi/design-system/Link';
 import { Button } from '@strapi/design-system/Button';
 import { Box } from '@strapi/design-system/Box';
 import { Typography } from '@strapi/design-system/Typography';

package/admin/src/content-manager/pages/EditView/Header/index.js

@@ -1,22 +1,22 @@
 import React, { memo, useRef, useState } from 'react';
 import { useIntl } from 'react-intl';
 import { useHistory } from 'react-router-dom';
+import PropTypes from 'prop-types';
+import isEqualFastCompare from 'react-fast-compare';
 import get from 'lodash/get';
 import isEqual from 'lodash/isEqual';
 import isEmpty from 'lodash/isEmpty';
 import ArrowLeft from '@strapi/icons/ArrowLeft';
+import { Link } from '@strapi/helper-plugin';
 import { HeaderLayout } from '@strapi/design-system/Layout';
 import { Box } from '@strapi/design-system/Box';
 import { Button } from '@strapi/design-system/Button';
 import { Dialog, DialogBody, DialogFooter } from '@strapi/design-system/Dialog';
-import { Link } from '@strapi/design-system/Link';
 import { Flex } from '@strapi/design-system/Flex';
 import { Typography } from '@strapi/design-system/Typography';
 import { Stack } from '@strapi/design-system/Stack';
 import ExclamationMarkCircle from '@strapi/icons/ExclamationMarkCircle';
 import Check from '@strapi/icons/Check';
-import PropTypes from 'prop-types';
-import isEqualFastCompare from 'react-fast-compare';
 import { getTrad } from '../../../utils';
 import { connect, getDraftRelations, select } from './utils';
 

package/admin/src/content-manager/pages/EditView/index.js

@@ -1,13 +1,12 @@
 import React, { memo, useCallback, useMemo } from 'react';
 import PropTypes from 'prop-types';
 import get from 'lodash/get';
-import { CheckPermissions, useTracking } from '@strapi/helper-plugin';
+import { CheckPermissions, useTracking, LinkButton } from '@strapi/helper-plugin';
 import { useIntl } from 'react-intl';
 import { ContentLayout } from '@strapi/design-system/Layout';
 import { Box } from '@strapi/design-system/Box';
 import { Divider } from '@strapi/design-system/Divider';
 import { Grid, GridItem } from '@strapi/design-system/Grid';
-import { LinkButton } from '@strapi/design-system/LinkButton';
 import { Main } from '@strapi/design-system/Main';
 import { Stack } from '@strapi/design-system/Stack';
 import { Typography } from '@strapi/design-system/Typography';
@@ -15,9 +14,7 @@ import Layer from '@strapi/icons/Layer';
 import Pencil from '@strapi/icons/Pencil';
 import { InjectionZone } from '../../../shared/components';
 import permissions from '../../../permissions';
-// import Container from '../../components/Container';
 import DynamicZone from '../../components/DynamicZone';
-// import FormWrapper from '../../components/FormWrapper';
 import FieldComponent from '../../components/FieldComponent';
 import Inputs from '../../components/Inputs';
 import SelectWrapper from '../../components/SelectWrapper';

package/admin/src/content-manager/pages/ListSettingsView/index.js

@@ -6,12 +6,11 @@ import upperFirst from 'lodash/upperFirst';
 import pick from 'lodash/pick';
 import get from 'lodash/get';
 import { stringify } from 'qs';
-import { useNotification, useTracking, ConfirmDialog } from '@strapi/helper-plugin';
+import { useNotification, useTracking, ConfirmDialog, Link } from '@strapi/helper-plugin';
 import { useIntl } from 'react-intl';
 import { Box } from '@strapi/design-system/Box';
 import { Divider } from '@strapi/design-system/Divider';
 import { Layout, HeaderLayout, ContentLayout } from '@strapi/design-system/Layout';
-import { Link } from '@strapi/design-system/Link';
 import { Main } from '@strapi/design-system/Main';
 import { Button } from '@strapi/design-system/Button';
 import Check from '@strapi/icons/Check';

package/admin/src/content-manager/pages/ListView/index.js

@@ -17,6 +17,7 @@ import {
   useNotification,
   useRBACProvider,
   useTracking,
+  Link,
 } from '@strapi/helper-plugin';
 import { IconButton } from '@strapi/design-system/IconButton';
 import { Main } from '@strapi/design-system/Main';
@@ -24,7 +25,6 @@ import { Box } from '@strapi/design-system/Box';
 import { ActionLayout, ContentLayout, HeaderLayout } from '@strapi/design-system/Layout';
 import { useNotifyAT } from '@strapi/design-system/LiveRegions';
 import { Button } from '@strapi/design-system/Button';
-import { Link } from '@strapi/design-system/Link';
 import ArrowLeft from '@strapi/icons/ArrowLeft';
 import Plus from '@strapi/icons/Plus';
 import Cog from '@strapi/icons/Cog';

package/admin/src/content-manager/pages/NoContentType/index.js

@@ -1,7 +1,6 @@
 import React from 'react';
-import { useFocusWhenNavigate } from '@strapi/helper-plugin';
+import { useFocusWhenNavigate, LinkButton } from '@strapi/helper-plugin';
 import { Main } from '@strapi/design-system/Main';
-import { LinkButton } from '@strapi/design-system/LinkButton';
 import { ContentLayout, HeaderLayout } from '@strapi/design-system/Layout';
 import { EmptyStateLayout } from '@strapi/design-system/EmptyStateLayout';
 import Plus from '@strapi/icons/Plus';

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

@@ -12,7 +12,6 @@ import {
   request,
   useNotification,
   TrackingContext,
-  prefixFileUrlWithBackendUrl,
 } from '@strapi/helper-plugin';
 import { SkipToContent } from '@strapi/design-system/Main';
 import { useIntl } from 'react-intl';
@@ -23,7 +22,6 @@ import NotFoundPage from '../NotFoundPage';
 import UseCasePage from '../UseCasePage';
 import { getUID } from './utils';
 import routes from './utils/routes';
-import { useConfigurations } from '../../hooks';
 
 const AuthenticatedApp = lazy(() =>
   import(/* webpackChunkName: "Admin-authenticatedApp" */ '../../components/AuthenticatedApp')
@@ -31,7 +29,6 @@ const AuthenticatedApp = lazy(() =>
 
 function App() {
   const toggleNotification = useNotification();
-  const { updateProjectSettings } = useConfigurations();
   const { formatMessage } = useIntl();
   const [{ isLoading, hasAdmin, uuid }, setState] = useState({ isLoading: true, hasAdmin: false });
 
@@ -69,11 +66,9 @@ function App() {
     const getData = async () => {
       try {
         const {
-          data: { hasAdmin, uuid, menuLogo },
+          data: { hasAdmin, uuid },
         } = await request('/admin/init', { method: 'GET' });
 
-        updateProjectSettings({ menuLogo: prefixFileUrlWithBackendUrl(menuLogo) });
-
         if (uuid) {
           try {
             const deviceId = await getUID();
@@ -104,7 +99,7 @@ function App() {
     };
 
     getData();
-  }, [toggleNotification, updateProjectSettings]);
+  }, [toggleNotification]);
 
   const setHasAdmin = hasAdmin => setState(prev => ({ ...prev, hasAdmin }));
 

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

@@ -1,12 +1,11 @@
 import React from 'react';
 import { useIntl } from 'react-intl';
 import PropTypes from 'prop-types';
-import { Form } from '@strapi/helper-plugin';
+import { Form, Link } from '@strapi/helper-plugin';
 import { Box } from '@strapi/design-system/Box';
 import { Stack } from '@strapi/design-system/Stack';
 import { Main } from '@strapi/design-system/Main';
 import { Flex } from '@strapi/design-system/Flex';
-import { Link } from '@strapi/design-system/Link';
 import { Button } from '@strapi/design-system/Button';
 import { TextInput } from '@strapi/design-system/TextInput';
 import { Typography } from '@strapi/design-system/Typography';

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

@@ -1,9 +1,9 @@
 import React from 'react';
 import { useIntl } from 'react-intl';
+import { Link } from '@strapi/helper-plugin';
 import { Box } from '@strapi/design-system/Box';
 import { Main } from '@strapi/design-system/Main';
 import { Flex } from '@strapi/design-system/Flex';
-import { Link } from '@strapi/design-system/Link';
 import { Typography } from '@strapi/design-system/Typography';
 import UnauthenticatedLayout, {
   Column,

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

@@ -1,16 +1,15 @@
 import React, { useState } from 'react';
+import { Form, Link } from '@strapi/helper-plugin';
 import EyeStriked from '@strapi/icons/EyeStriked';
 import Eye from '@strapi/icons/Eye';
 import { Box } from '@strapi/design-system/Box';
 import { Stack } from '@strapi/design-system/Stack';
 import { Main } from '@strapi/design-system/Main';
 import { Flex } from '@strapi/design-system/Flex';
-import { Link } from '@strapi/design-system/Link';
 import { Button } from '@strapi/design-system/Button';
 import { TextInput } from '@strapi/design-system/TextInput';
 import { Checkbox } from '@strapi/design-system/Checkbox';
 import { Typography } from '@strapi/design-system/Typography';
-import { Form } from '@strapi/helper-plugin';
 import PropTypes from 'prop-types';
 import { useIntl } from 'react-intl';
 import styled from 'styled-components';

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

@@ -1,10 +1,9 @@
 import React from 'react';
 import { useIntl } from 'react-intl';
-import { useQuery } from '@strapi/helper-plugin';
+import { useQuery, Link } from '@strapi/helper-plugin';
 import { Box } from '@strapi/design-system/Box';
 import { Main } from '@strapi/design-system/Main';
 import { Flex } from '@strapi/design-system/Flex';
-import { Link } from '@strapi/design-system/Link';
 import { Typography } from '@strapi/design-system/Typography';
 import UnauthenticatedLayout, {
   Column,

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

@@ -3,11 +3,22 @@ import { useIntl } from 'react-intl';
 import styled from 'styled-components';
 import get from 'lodash/get';
 import omit from 'lodash/omit';
+import { useHistory } from 'react-router-dom';
+import PropTypes from 'prop-types';
+import { Formik } from 'formik';
+import axios from 'axios';
+import {
+  Form,
+  useQuery,
+  useNotification,
+  useTracking,
+  getYupInnerErrors,
+  Link,
+} from '@strapi/helper-plugin';
 import { Box } from '@strapi/design-system/Box';
 import { Stack } from '@strapi/design-system/Stack';
 import { Main } from '@strapi/design-system/Main';
 import { Flex } from '@strapi/design-system/Flex';
-import { Link } from '@strapi/design-system/Link';
 import { Button } from '@strapi/design-system/Button';
 import { TextInput } from '@strapi/design-system/TextInput';
 import { Checkbox } from '@strapi/design-system/Checkbox';
@@ -15,17 +26,6 @@ import { Grid, GridItem } from '@strapi/design-system/Grid';
 import { Typography } from '@strapi/design-system/Typography';
 import EyeStriked from '@strapi/icons/EyeStriked';
 import Eye from '@strapi/icons/Eye';
-import {
-  Form,
-  useQuery,
-  useNotification,
-  useTracking,
-  getYupInnerErrors,
-} from '@strapi/helper-plugin';
-import { useHistory } from 'react-router-dom';
-import PropTypes from 'prop-types';
-import { Formik } from 'formik';
-import axios from 'axios';
 import UnauthenticatedLayout, {
   Column,
   LayoutContent,

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

@@ -1,19 +1,18 @@
 import React, { useState } from 'react';
 import { useIntl } from 'react-intl';
 import PropTypes from 'prop-types';
-import { Form } from '@strapi/helper-plugin';
+import styled from 'styled-components';
+import { Formik } from 'formik';
+import { Form, Link } from '@strapi/helper-plugin';
 import { Box } from '@strapi/design-system/Box';
 import { Stack } from '@strapi/design-system/Stack';
 import { Main } from '@strapi/design-system/Main';
 import { Flex } from '@strapi/design-system/Flex';
-import { Link } from '@strapi/design-system/Link';
 import { Button } from '@strapi/design-system/Button';
 import { TextInput } from '@strapi/design-system/TextInput';
 import { Typography } from '@strapi/design-system/Typography';
 import EyeStriked from '@strapi/icons/EyeStriked';
 import Eye from '@strapi/icons/Eye';
-import styled from 'styled-components';
-import { Formik } from 'formik';
 import UnauthenticatedLayout, {
   Column,
   LayoutContent,