From 6bf0ee33b08edaf49be09f94aa8c3178431cbb7a Mon Sep 17 00:00:00 2001 From: Christian Capeans Date: Wed, 10 Apr 2024 10:59:56 +0200 Subject: [PATCH] fix: link dependency coming from react-router-dom --- .../admin/admin/src/pages/InternalErrorPage.tsx | 4 +++- .../core/admin/admin/src/pages/NotFoundPage.tsx | 4 +++- .../pages/Settings/pages/ApiTokens/ListView.tsx | 14 +++++++++++--- .../Settings/pages/TransferTokens/ListView.tsx | 10 +++++++--- .../AttributeOptions/EmptyAttributes.tsx | 5 ++++- 5 files changed, 28 insertions(+), 9 deletions(-) diff --git a/packages/core/admin/admin/src/pages/InternalErrorPage.tsx b/packages/core/admin/admin/src/pages/InternalErrorPage.tsx index a74a1cfc73..648c42bf64 100644 --- a/packages/core/admin/admin/src/pages/InternalErrorPage.tsx +++ b/packages/core/admin/admin/src/pages/InternalErrorPage.tsx @@ -9,6 +9,7 @@ import { ContentLayout, EmptyStateLayout, HeaderLayout } from '@strapi/design-sy import { LinkButton } from '@strapi/design-system/v2'; import { ArrowRight, EmptyPictures } from '@strapi/icons'; import { useIntl } from 'react-intl'; +import { Link } from 'react-router-dom'; import { Page } from '../components/PageHelpers'; @@ -27,7 +28,8 @@ export const InternalErrorPage = () => { } href="/"> + // @ts-expect-error We need to accept the props of the component passed in the `as` prop + } to="/"> {formatMessage({ id: 'app.components.NotFoundPage.back', defaultMessage: 'Back to homepage', diff --git a/packages/core/admin/admin/src/pages/NotFoundPage.tsx b/packages/core/admin/admin/src/pages/NotFoundPage.tsx index 09c2d3540d..61c5ec7806 100644 --- a/packages/core/admin/admin/src/pages/NotFoundPage.tsx +++ b/packages/core/admin/admin/src/pages/NotFoundPage.tsx @@ -8,6 +8,7 @@ import { ContentLayout, EmptyStateLayout, HeaderLayout } from '@strapi/design-sy import { LinkButton } from '@strapi/design-system/v2'; import { ArrowRight, EmptyPictures } from '@strapi/icons'; import { useIntl } from 'react-intl'; +import { Link } from 'react-router-dom'; import { Page } from '../components/PageHelpers'; @@ -26,7 +27,8 @@ export const NotFoundPage = () => { } href="/"> + // @ts-expect-error We need to accept the props of the component passed in the `as` prop + } to="/"> {formatMessage({ id: 'app.components.NotFoundPage.back', defaultMessage: 'Back to homepage', diff --git a/packages/core/admin/admin/src/pages/Settings/pages/ApiTokens/ListView.tsx b/packages/core/admin/admin/src/pages/Settings/pages/ApiTokens/ListView.tsx index 6350069c0e..b3a6757894 100644 --- a/packages/core/admin/admin/src/pages/Settings/pages/ApiTokens/ListView.tsx +++ b/packages/core/admin/admin/src/pages/Settings/pages/ApiTokens/ListView.tsx @@ -6,7 +6,7 @@ import { EmptyDocuments, Plus } from '@strapi/icons'; import { Data } from '@strapi/types'; import * as qs from 'qs'; import { useIntl } from 'react-intl'; -import { useNavigate } from 'react-router-dom'; +import { Link, useNavigate } from 'react-router-dom'; import { useGuidedTour } from '../../../../components/GuidedTour/Provider'; import { Page } from '../../../../components/PageHelpers'; @@ -147,6 +147,7 @@ export const ListView = () => { primaryAction={ canCreate && ( } size="S" @@ -155,7 +156,8 @@ export const ListView = () => { tokenType: API_TOKEN_TYPE, }) } - href="api-tokens/create" + // @ts-expect-error We need to accept the props of the component passed in the `as` prop + to="/settings/api-tokens/create" > {formatMessage({ id: 'Settings.apiTokens.create', @@ -188,7 +190,13 @@ export const ListView = () => { defaultMessage: 'Add your first API Token', })} action={ - } href="api-tokens/create"> + } + // @ts-expect-error We need to accept the props of the component passed in the `as` prop + to="/settings/api-tokens/create" + > {formatMessage({ id: 'Settings.apiTokens.addNewToken', defaultMessage: 'Add new API Token', diff --git a/packages/core/admin/admin/src/pages/Settings/pages/TransferTokens/ListView.tsx b/packages/core/admin/admin/src/pages/Settings/pages/TransferTokens/ListView.tsx index 50a409b2e8..9f8b51071d 100644 --- a/packages/core/admin/admin/src/pages/Settings/pages/TransferTokens/ListView.tsx +++ b/packages/core/admin/admin/src/pages/Settings/pages/TransferTokens/ListView.tsx @@ -6,7 +6,7 @@ import { EmptyDocuments, Plus } from '@strapi/icons'; import { Data } from '@strapi/types'; import * as qs from 'qs'; import { useIntl } from 'react-intl'; -import { useNavigate } from 'react-router-dom'; +import { Link, useNavigate } from 'react-router-dom'; import { Page } from '../../../../components/PageHelpers'; import { useTypedSelector } from '../../../../core/store/hooks'; @@ -160,6 +160,7 @@ const ListView = () => { primaryAction={ canCreate ? ( } size="S" @@ -168,7 +169,8 @@ const ListView = () => { tokenType: TRANSFER_TOKEN_TYPE, }) } - href="transfer-tokens/create" + // @ts-expect-error We need to accept the props of the component passed in the `as` prop + to="/settings/transfer-tokens/create" > {formatMessage({ id: 'Settings.transferTokens.create', @@ -197,9 +199,11 @@ const ListView = () => { } - href="transfer-tokens/create" + // @ts-expect-error We need to accept the props of the component passed in the `as` prop + to="/settings/transfer-tokens/create" > {formatMessage({ id: 'Settings.transferTokens.addNewToken', diff --git a/packages/core/content-type-builder/admin/src/components/AttributeOptions/EmptyAttributes.tsx b/packages/core/content-type-builder/admin/src/components/AttributeOptions/EmptyAttributes.tsx index b9e1588e1a..5314301488 100644 --- a/packages/core/content-type-builder/admin/src/components/AttributeOptions/EmptyAttributes.tsx +++ b/packages/core/content-type-builder/admin/src/components/AttributeOptions/EmptyAttributes.tsx @@ -3,6 +3,7 @@ import { LinkButton } from '@strapi/design-system/v2'; import { EmptyDocuments, Plus } from '@strapi/icons'; import * as qs from 'qs'; import { useIntl } from 'react-intl'; +import { Link } from 'react-router-dom'; import styled from 'styled-components'; import { getTrad } from '../../utils'; @@ -60,7 +61,9 @@ export const EmptyAttributes = () => { } >