refactor: migrate design-system components for Strapi 5

pull/127/head
Boaz Poolman 2024-05-31 08:26:15 +02:00
parent e3f551e965
commit 7ab1ad86e9
6 changed files with 14 additions and 13 deletions

View File

@ -29,6 +29,7 @@
"import/no-unresolved": [2, { "import/no-unresolved": [2, {
"ignore": [ "ignore": [
"@strapi/strapi/admin", "@strapi/strapi/admin",
"@strapi/icons/symbols",
"@strapi/admin/strapi-admin" "@strapi/admin/strapi-admin"
] ]
}], }],

View File

@ -8,13 +8,12 @@ import {
DialogFooter, DialogFooter,
Flex, Flex,
Typography, Typography,
Stack,
Button, Button,
Checkbox, Checkbox,
Divider, Divider,
Box, Box,
} from '@strapi/design-system'; } from '@strapi/design-system';
import { ExclamationMarkCircle } from '@strapi/icons'; import { WarningCircle } from '@strapi/icons';
const ConfirmModal = ({ isOpen, onClose, onSubmit, type }) => { const ConfirmModal = ({ isOpen, onClose, onSubmit, type }) => {
const soft = useSelector((state) => state.getIn(['config', 'appEnv', 'config', 'soft'], false)); 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" })} title={formatMessage({ id: "config-sync.popUpWarning.Confirmation" })}
isOpen={isOpen} isOpen={isOpen}
> >
<DialogBody icon={<ExclamationMarkCircle />}> <DialogBody icon={<WarningCircle />}>
<Stack size={2}> <Flex size={2}>
<Flex justifyContent="center"> <Flex justifyContent="center">
<Typography variant="omega" id="confirm-description" style={{ textAlign: 'center' }}> <Typography variant="omega" id="confirm-description" style={{ textAlign: 'center' }}>
{formatMessage({ id: `config-sync.popUpWarning.warning.${type}_1` })}<br /> {formatMessage({ id: `config-sync.popUpWarning.warning.${type}_1` })}<br />
{formatMessage({ id: `config-sync.popUpWarning.warning.${type}_2` })} {formatMessage({ id: `config-sync.popUpWarning.warning.${type}_2` })}
</Typography> </Typography>
</Flex> </Flex>
</Stack> </Flex>
</DialogBody> </DialogBody>
{(soft && type === 'import') && ( {(soft && type === 'import') && (
<React.Fragment> <React.Fragment>

View File

@ -3,7 +3,8 @@ import { useIntl } from 'react-intl';
import { useDispatch } from 'react-redux'; import { useDispatch } from 'react-redux';
import { getFetchClient, useNotification } from '@strapi/strapi/admin'; import { getFetchClient, useNotification } from '@strapi/strapi/admin';
import { Button, EmptyStateLayout } from '@strapi/design-system'; 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 { exportAllConfig } from '../../state/actions/Config';
import ConfirmModal from '../ConfirmModal'; import ConfirmModal from '../ConfirmModal';

View File

@ -7,14 +7,15 @@
import React, { memo } from 'react'; import React, { memo } from 'react';
import { useIntl } from 'react-intl'; 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 HeaderComponent = () => {
const { formatMessage } = useIntl(); const { formatMessage } = useIntl();
return ( return (
<Box background="neutral100"> <Box background="neutral100">
<HeaderLayout <Layouts.Header
title={formatMessage({ id: 'config-sync.Header.Title' })} title={formatMessage({ id: 'config-sync.Header.Title' })}
subtitle={formatMessage({ id: 'config-sync.Header.Description' })} subtitle={formatMessage({ id: 'config-sync.Header.Description' })}
as="h2" as="h2"

View File

@ -1,7 +1,7 @@
import React from 'react'; import React from 'react';
import { EmptyStateLayout } from '@strapi/design-system'; import { EmptyStateLayout } from '@strapi/design-system';
import { useIntl } from 'react-intl'; import { useIntl } from 'react-intl';
import { EmptyDocuments } from '@strapi/icons'; import { EmptyDocuments } from '@strapi/icons/symbols';
const NoChanges = () => { const NoChanges = () => {
const { formatMessage } = useIntl(); const { formatMessage } = useIntl();

View File

@ -3,12 +3,11 @@ import { useDispatch, useSelector } from 'react-redux';
import { Map } from 'immutable'; import { Map } from 'immutable';
import { import {
Box, Box,
ContentLayout,
Alert, Alert,
Typography, Typography,
} from '@strapi/design-system'; } from '@strapi/design-system';
import { useNotification } from '@strapi/strapi/admin'; 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 { useIntl } from 'react-intl';
import { getAllConfigDiff, getAppEnv } from '../../state/actions/Config'; import { getAllConfigDiff, getAppEnv } from '../../state/actions/Config';
@ -31,7 +30,7 @@ const ConfigPage = () => {
}, []); }, []);
return ( return (
<ContentLayout paddingBottom={8}> <Layouts.Content paddingBottom={8}>
{appEnv === 'production' && ( {appEnv === 'production' && (
<Box paddingBottom={4}> <Box paddingBottom={4}>
<Alert variant="danger"> <Alert variant="danger">
@ -43,7 +42,7 @@ const ConfigPage = () => {
)} )}
<ActionButtons /> <ActionButtons />
<ConfigList isLoading={isLoading} diff={configDiff.toJS()} /> <ConfigList isLoading={isLoading} diff={configDiff.toJS()} />
</ContentLayout> </Layouts.Content>
); );
}; };