From a8794d41a821a017fc2fdc54defacba6839fd0e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krzysztof=20=C5=BBuraw?= <9116238+krzysztofzuraw@users.noreply.github.com> Date: Wed, 2 Aug 2023 10:05:24 +0200 Subject: [PATCH] Fix `react/jsx-key` ESLint rule (#4046) --- .changeset/warm-garlics-provide.md | 5 +++++ .eslintrc.json | 3 +-- src/components/ButtonWithDropdown/ButtonWithDropdown.tsx | 4 ++-- src/components/Datagrid/Datagrid.tsx | 3 ++- src/components/Filter/FilterKeyValueField.tsx | 5 ++++- src/components/Timeline/TimelineEventHeader.tsx | 8 +++++++- src/components/Timeline/TimelineNote.tsx | 4 ++-- src/configuration/ConfigurationPage.tsx | 6 +++++- .../OrderGrantRefundPage/OrderGrantRefundPage.tsx | 1 + src/orders/components/OrderHistory/OrderHistory.tsx | 1 + src/orders/components/OrderPayment/OrderPayment.tsx | 2 +- .../components/OrderSendRefundPage/OrderSendRefund.tsx | 2 +- .../components/OrderSummaryCard/OrderSummaryCard.tsx | 1 + .../OrderTransaction/components/CardTitle/CardTitle.tsx | 6 +++--- .../ProductExportDialog/ProductExportDialogInfo.tsx | 2 ++ .../ChannelsAvailabilityCard/AvailabilityCard.tsx | 6 +++++- 16 files changed, 43 insertions(+), 16 deletions(-) create mode 100644 .changeset/warm-garlics-provide.md diff --git a/.changeset/warm-garlics-provide.md b/.changeset/warm-garlics-provide.md new file mode 100644 index 000000000..9dbb1f9a2 --- /dev/null +++ b/.changeset/warm-garlics-provide.md @@ -0,0 +1,5 @@ +--- +"saleor-dashboard": patch +--- + +Fix `react/jsx-key` eslint rule diff --git a/.eslintrc.json b/.eslintrc.json index 3ea87a766..e8d0c30e4 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -110,8 +110,7 @@ "no-useless-catch": "off", "no-useless-escape": "off", "prefer-promise-reject-errors": "off", - "react/display-name": "off", - "react/jsx-key": "warn" + "react/display-name": "warn" }, "ignorePatterns": ["node_modules/", "**/types/**/*", "type-policies.ts"] } diff --git a/src/components/ButtonWithDropdown/ButtonWithDropdown.tsx b/src/components/ButtonWithDropdown/ButtonWithDropdown.tsx index a58fb28f8..265946610 100644 --- a/src/components/ButtonWithDropdown/ButtonWithDropdown.tsx +++ b/src/components/ButtonWithDropdown/ButtonWithDropdown.tsx @@ -37,8 +37,8 @@ export const ButtonWithDropdown: React.FC = ({ boxShadow="overlay" backgroundColor="surfaceNeutralPlain" > - {options.map(item => ( - + {options.map((item, idx) => ( + = ({ .fill(0) .map((_, index) => ( = rowsTotal - added.length} /> diff --git a/src/components/Filter/FilterKeyValueField.tsx b/src/components/Filter/FilterKeyValueField.tsx index 0e9fd4f6e..21fc64637 100644 --- a/src/components/Filter/FilterKeyValueField.tsx +++ b/src/components/Filter/FilterKeyValueField.tsx @@ -70,7 +70,10 @@ export const FilterKeyValueField = ({
{values.map((innerField, index) => ( -
+
navigate(link)} + key={`timeline-event-${link}`} > {text} @@ -61,7 +62,12 @@ export const TimelineEventHeader: React.FC< } return ( - + {text} ); diff --git a/src/components/Timeline/TimelineNote.tsx b/src/components/Timeline/TimelineNote.tsx index ecc71546b..49e685a02 100644 --- a/src/components/Timeline/TimelineNote.tsx +++ b/src/components/Timeline/TimelineNote.tsx @@ -65,10 +65,10 @@ const NoteMessage: React.FC = ({ message }) => ( <> {message.split("\n").map(string => { if (string === "") { - return
; + return
; } - return {string}; + return {string}; })} ); diff --git a/src/configuration/ConfigurationPage.tsx b/src/configuration/ConfigurationPage.tsx index f46bb934f..115784a79 100644 --- a/src/configuration/ConfigurationPage.tsx +++ b/src/configuration/ConfigurationPage.tsx @@ -118,7 +118,11 @@ export const ConfigurationPage: React.FC = props => { hasUserMenuItemPermissions(menuItem, user), ) .map((item, itemIndex) => ( - + = ({ /> {order?.fulfillments?.map?.(fulfillment => ( = props => { if (isTimelineEventOfType("extendable", type)) { return ( = props => {
{order?.discounts?.map(discount => ( -
+
diff --git a/src/orders/components/OrderSendRefundPage/OrderSendRefund.tsx b/src/orders/components/OrderSendRefundPage/OrderSendRefund.tsx index 0ddec868d..13815c7e7 100644 --- a/src/orders/components/OrderSendRefundPage/OrderSendRefund.tsx +++ b/src/orders/components/OrderSendRefundPage/OrderSendRefund.tsx @@ -122,7 +122,7 @@ const OrderSendRefundPage: React.FC = ({ {loading && }
    {order?.transactions.map(transaction => ( - + ))} diff --git a/src/orders/components/OrderSummaryCard/OrderSummaryCard.tsx b/src/orders/components/OrderSummaryCard/OrderSummaryCard.tsx index 3a3a99ce3..4451b95c3 100644 --- a/src/orders/components/OrderSummaryCard/OrderSummaryCard.tsx +++ b/src/orders/components/OrderSummaryCard/OrderSummaryCard.tsx @@ -65,6 +65,7 @@ const OrderSummaryCard: React.FC = ({ order }) => { /> {order?.discounts?.map(discount => ( } subText={ discount.type === OrderDiscountType.MANUAL diff --git a/src/orders/components/OrderTransaction/components/CardTitle/CardTitle.tsx b/src/orders/components/OrderTransaction/components/CardTitle/CardTitle.tsx index 5f266f514..4ad25f3d3 100644 --- a/src/orders/components/OrderTransaction/components/CardTitle/CardTitle.tsx +++ b/src/orders/components/OrderTransaction/components/CardTitle/CardTitle.tsx @@ -45,10 +45,10 @@ export const CardTitle: React.FC = ({ chargePendingAmount, canceledAmount, chargedAmount, - authorizedAmount + authorizedAmount, } = transaction; - const title = capitalize(transaction.name || "Transaction") + const title = capitalize(transaction.name || "Transaction"); return ( = ({ transaction.actions .filter(action => action !== TransactionActionEnum.REFUND) .map(action => ( -
    +