From 1d283eb98e646d81e8bb2611a040c5411f18cb0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20de=20Juvigny?= <remi.dejuvigny@strapi.io>
Date: Wed, 3 May 2023 10:49:45 +0200
Subject: [PATCH] Mark feedback

---
 .../DynamicTable/BulkActionsBar/index.js      | 23 ++++++++-----------
 .../ConfirmBulkActionDialog/index.js          | 12 ++++++----
 .../i18n/admin/src/translations/en.json       |  4 ++--
 3 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/packages/core/admin/admin/src/content-manager/components/DynamicTable/BulkActionsBar/index.js b/packages/core/admin/admin/src/content-manager/components/DynamicTable/BulkActionsBar/index.js
index 62e9353f48..32e2d3f127 100644
--- a/packages/core/admin/admin/src/content-manager/components/DynamicTable/BulkActionsBar/index.js
+++ b/packages/core/admin/admin/src/content-manager/components/DynamicTable/BulkActionsBar/index.js
@@ -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
diff --git a/packages/core/admin/admin/src/content-manager/components/DynamicTable/ConfirmBulkActionDialog/index.js b/packages/core/admin/admin/src/content-manager/components/DynamicTable/ConfirmBulkActionDialog/index.js
index 2945960fb5..183df09c29 100644
--- a/packages/core/admin/admin/src/content-manager/components/DynamicTable/ConfirmBulkActionDialog/index.js
+++ b/packages/core/admin/admin/src/content-manager/components/DynamicTable/ConfirmBulkActionDialog/index.js
@@ -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,
 };
diff --git a/packages/plugins/i18n/admin/src/translations/en.json b/packages/plugins/i18n/admin/src/translations/en.json
index b2d1283575..eb671e6ce1 100644
--- a/packages/plugins/i18n/admin/src/translations/en.json
+++ b/packages/plugins/i18n/admin/src/translations/en.json
@@ -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.",