yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-06 23:28:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Mark feedback

Browse Source
This commit is contained in:
Rémi de Juvigny 2023-05-03 10:49:45 +02:00
parent bd4011e1a8
commit 1d283eb98e
3 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
packages/core/admin/admin/src/content-manager/components/DynamicTable/BulkActionsBar/index.js
View File

@ -1,7 +1,7 @@
import React, { useState } from 'react';
import PropTypes from 'prop-types';
import { Button, Flex, Typography } from '@strapi/design-system';
import { Check, ExclamationMarkCircle, Trash } from '@strapi/icons';
import { Button, Typography } from '@strapi/design-system';
import { Check, Trash } from '@strapi/icons';
import { useIntl } from 'react-intl';
import { useTracking } from '@strapi/helper-plugin';
import { getTrad } from '../../../utils';
@ -22,9 +22,8 @@ const ConfirmDialogPublishAll = ({ isOpen, onToggleDialog, isConfirmButtonLoadin
<ConfirmBulkActionDialog
isOpen={isOpen}
onToggleDialog={onToggleDialog}
icon={<ExclamationMarkCircle />}
dialogBody={
<Flex direction="column" alignItems="stretch" gap={2}>
<>
<Typography id="confirm-description" textAlign="center">
{formatMessage({
id: getTrad('popUpWarning.bodyMessage.contentType.publish.all'),
@ -32,7 +31,7 @@ const ConfirmDialogPublishAll = ({ isOpen, onToggleDialog, isConfirmButtonLoadin
})}
</Typography>
<InjectionZoneList area="contentManager.listView.publishModalAdditionalInfos" />
</Flex>
</>
}
endAction={
<Button
@ -65,19 +64,16 @@ const ConfirmDialogUnpublishAll = ({
<ConfirmBulkActionDialog
isOpen={isOpen}
onToggleDialog={onToggleDialog}
icon={<ExclamationMarkCircle />}
dialogBody={
<Flex direction="column" alignItems="stretch" gap={2}>
<>
<Typography id="confirm-description" textAlign="center">
{formatMessage({
id: getTrad('popUpWarning.bodyMessage.contentType.unpublish.all'),
defaultMessage: 'Are you sure you want to unpublish these entries?',
})}
</Typography>
<Flex>
<InjectionZoneList area="contentManager.listView.unpublishModalAdditionalInfos" />
</Flex>
</Flex>
<InjectionZoneList area="contentManager.listView.unpublishModalAdditionalInfos" />
</>
}
endAction={
<Button
@ -105,9 +101,8 @@ const ConfirmDialogDeleteAll = ({ isOpen, onToggleDialog, isConfirmButtonLoading
<ConfirmBulkActionDialog
isOpen={isOpen}
onToggleDialog={onToggleDialog}
icon={<ExclamationMarkCircle />}
dialogBody={
<Flex direction="column" alignItems="stretch" gap={2}>
<>
<Typography id="confirm-description" textAlign="center">
{formatMessage({
id: getTrad('popUpWarning.bodyMessage.contentType.delete.all'),
@ -115,7 +110,7 @@ const ConfirmDialogDeleteAll = ({ isOpen, onToggleDialog, isConfirmButtonLoading
})}
</Typography>
<InjectionZoneList area="contentManager.listView.deleteModalAdditionalInfos" />
</Flex>
</>
}
endAction={
<Button

12
packages/core/admin/admin/src/content-manager/components/DynamicTable/ConfirmBulkActionDialog/index.js
View File

@ -1,9 +1,10 @@
import React from 'react';
import PropTypes from 'prop-types';
import { useIntl } from 'react-intl';
import { Dialog, DialogBody, DialogFooter, Button } from '@strapi/design-system';
import { Button, Dialog, DialogBody, DialogFooter, Flex } from '@strapi/design-system';
import { ExclamationMarkCircle } from '@strapi/icons';
const ConfirmBulkActionDialog = ({ onToggleDialog, isOpen, icon, dialogBody, endAction }) => {
const ConfirmBulkActionDialog = ({ onToggleDialog, isOpen, dialogBody, endAction }) => {
const { formatMessage } = useIntl();
return (
@ -17,7 +18,11 @@ const ConfirmBulkActionDialog = ({ onToggleDialog, isOpen, icon, dialogBody, end
describedBy="confirm-description"
isOpen={isOpen}
>
<DialogBody icon={icon}>{dialogBody}</DialogBody>
<DialogBody icon={<ExclamationMarkCircle />}>
<Flex direction="column" alignItems="stretch" gap={2}>
{dialogBody}
</Flex>
</DialogBody>
<DialogFooter
startAction={
<Button onClick={onToggleDialog} variant="tertiary">
@ -36,7 +41,6 @@ const ConfirmBulkActionDialog = ({ onToggleDialog, isOpen, icon, dialogBody, end
ConfirmBulkActionDialog.propTypes = {
isOpen: PropTypes.bool.isRequired,
onToggleDialog: PropTypes.func.isRequired,
icon: PropTypes.node.isRequired,
dialogBody: PropTypes.node.isRequired,
endAction: PropTypes.node.isRequired,
};

4
packages/plugins/i18n/admin/src/translations/en.json
View File

@ -12,8 +12,8 @@
"Settings.list.actions.add": "Add new locale",
"Settings.list.actions.delete": "Delete a locale",
"Settings.list.actions.deleteAdditionalInfos": "This will delete the active locale versions <em>(from Internationalization)</em>",
"Settings.list.actions.publishAdditionalInfos": "This will publish only the active locale versions <em>(from Internationalization)</em>",
"Settings.list.actions.unpublishAdditionalInfos": "This will unpublish only the active locale versions <em>(from Internationalization)</em>",
"Settings.list.actions.publishAdditionalInfos": "This will publish the active locale versions <em>(from Internationalization)</em>",
"Settings.list.actions.unpublishAdditionalInfos": "This will unpublish the active locale versions <em>(from Internationalization)</em>",
"Settings.list.actions.edit": "Edit a locale",
"Settings.list.description": "Configure the settings for the Internationalization plugin",
"Settings.list.empty.description": "This is not a usual behavior, meaning that you have eventually modified the database manually. Make sure to have at least one locale saved in your database in order to be able to use Strapi correctly.",