diff --git a/.eslintrc b/.eslintrc index 2471753..dc830b3 100644 --- a/.eslintrc +++ b/.eslintrc @@ -29,6 +29,7 @@ "import/no-unresolved": [2, { "ignore": [ "@strapi/strapi/admin", + "@strapi/icons/symbols", "@strapi/admin/strapi-admin" ] }], diff --git a/admin/src/components/ConfirmModal/index.jsx b/admin/src/components/ConfirmModal/index.jsx index c26e842..350070b 100644 --- a/admin/src/components/ConfirmModal/index.jsx +++ b/admin/src/components/ConfirmModal/index.jsx @@ -8,13 +8,12 @@ import { DialogFooter, Flex, Typography, - Stack, Button, Checkbox, Divider, Box, } from '@strapi/design-system'; -import { ExclamationMarkCircle } from '@strapi/icons'; +import { WarningCircle } from '@strapi/icons'; const ConfirmModal = ({ isOpen, onClose, onSubmit, type }) => { const soft = useSelector((state) => state.getIn(['config', 'appEnv', 'config', 'soft'], false)); @@ -29,15 +28,15 @@ const ConfirmModal = ({ isOpen, onClose, onSubmit, type }) => { title={formatMessage({ id: "config-sync.popUpWarning.Confirmation" })} isOpen={isOpen} > - }> - + }> + {formatMessage({ id: `config-sync.popUpWarning.warning.${type}_1` })}
{formatMessage({ id: `config-sync.popUpWarning.warning.${type}_2` })}
-
+
{(soft && type === 'import') && ( diff --git a/admin/src/components/FirstExport/index.jsx b/admin/src/components/FirstExport/index.jsx index 1087667..151ea35 100644 --- a/admin/src/components/FirstExport/index.jsx +++ b/admin/src/components/FirstExport/index.jsx @@ -3,7 +3,8 @@ import { useIntl } from 'react-intl'; import { useDispatch } from 'react-redux'; import { getFetchClient, useNotification } from '@strapi/strapi/admin'; import { Button, EmptyStateLayout } from '@strapi/design-system'; -import { EmptyDocuments } from '@strapi/icons'; +import { EmptyDocuments } from '@strapi/icons/symbols'; + import { exportAllConfig } from '../../state/actions/Config'; import ConfirmModal from '../ConfirmModal'; diff --git a/admin/src/components/Header/index.jsx b/admin/src/components/Header/index.jsx index 4774b15..1fa3259 100644 --- a/admin/src/components/Header/index.jsx +++ b/admin/src/components/Header/index.jsx @@ -7,14 +7,15 @@ import React, { memo } from 'react'; import { useIntl } from 'react-intl'; -import { HeaderLayout, Box } from '@strapi/design-system'; +import { Layouts } from '@strapi/admin/strapi-admin'; +import { Box } from '@strapi/design-system'; const HeaderComponent = () => { const { formatMessage } = useIntl(); return ( - { const { formatMessage } = useIntl(); diff --git a/admin/src/containers/ConfigPage/index.jsx b/admin/src/containers/ConfigPage/index.jsx index 0f47673..0d8bab9 100644 --- a/admin/src/containers/ConfigPage/index.jsx +++ b/admin/src/containers/ConfigPage/index.jsx @@ -3,12 +3,11 @@ import { useDispatch, useSelector } from 'react-redux'; import { Map } from 'immutable'; import { Box, - ContentLayout, Alert, Typography, } from '@strapi/design-system'; import { useNotification } from '@strapi/strapi/admin'; -import { getFetchClient } from '@strapi/admin/strapi-admin'; +import { getFetchClient, Layouts } from '@strapi/admin/strapi-admin'; import { useIntl } from 'react-intl'; import { getAllConfigDiff, getAppEnv } from '../../state/actions/Config'; @@ -31,7 +30,7 @@ const ConfigPage = () => { }, []); return ( - + {appEnv === 'production' && ( @@ -43,7 +42,7 @@ const ConfigPage = () => { )} - + ); };