From a9745e492f2c168db6f1e68f4834e6e5e8a476a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Chy=C5=82a?= Date: Tue, 19 Mar 2024 11:48:30 +0100 Subject: [PATCH] Remove brackets next to order status title (#4736) * Remove brackets * Changeset add --- .changeset/famous-grapes-stare.md | 5 +++++ .../OrderCardTitle/OrderCardTitle.tsx | 8 ++------ src/orders/components/OrderCardTitle/utils.ts | 17 +---------------- .../OrderFulfilledProductsCard.tsx | 1 - .../ReturnItemsCard.tsx | 1 - .../components/ItemsCard/ItemsCard.tsx | 1 - .../OrderUnfulfilledProductsCard.tsx | 1 - 7 files changed, 8 insertions(+), 26 deletions(-) create mode 100644 .changeset/famous-grapes-stare.md diff --git a/.changeset/famous-grapes-stare.md b/.changeset/famous-grapes-stare.md new file mode 100644 index 00000000000..2b546a10ffb --- /dev/null +++ b/.changeset/famous-grapes-stare.md @@ -0,0 +1,5 @@ +--- +"saleor-dashboard": minor +--- + +Remove brackets next to each order status title due to cause confusing for the clients diff --git a/src/orders/components/OrderCardTitle/OrderCardTitle.tsx b/src/orders/components/OrderCardTitle/OrderCardTitle.tsx index 7b807834b6b..20fe0f60189 100644 --- a/src/orders/components/OrderCardTitle/OrderCardTitle.tsx +++ b/src/orders/components/OrderCardTitle/OrderCardTitle.tsx @@ -9,7 +9,7 @@ import { FormattedMessage, useIntl } from "react-intl"; import { orderTitleMessages } from "./messages"; import { useStyles } from "./styles"; -import { getFulfillmentTotalQuantity, getOrderTitleMessage } from "./utils"; +import { getOrderTitleMessage } from "./utils"; export type CardTitleStatus = FulfillmentStatus | "unfulfilled"; @@ -19,7 +19,6 @@ export type CardTitleLines = Array<{ }>; interface OrderCardTitleProps { - lines?: CardTitleLines; fulfillmentOrder?: number; status: CardTitleStatus; toolbar?: React.ReactNode; @@ -51,7 +50,6 @@ const selectStatus = (status: CardTitleStatus) => { }; const OrderCardTitle: React.FC = ({ - lines = [], status, warehouseName, withStatus = false, @@ -63,8 +61,6 @@ const OrderCardTitle: React.FC = ({ const messageForStatus = getOrderTitleMessage(status); - const totalQuantity = getFulfillmentTotalQuantity(lines, status); - return ( = ({ )} - {intl.formatMessage(messageForStatus)} ({totalQuantity}) + {intl.formatMessage(messageForStatus)} {!!warehouseName && ( diff --git a/src/orders/components/OrderCardTitle/utils.ts b/src/orders/components/OrderCardTitle/utils.ts index 7108b2aac7f..9f4b2049c8c 100644 --- a/src/orders/components/OrderCardTitle/utils.ts +++ b/src/orders/components/OrderCardTitle/utils.ts @@ -2,22 +2,7 @@ import camelCase from "lodash/camelCase"; import { orderTitleMessages } from "./messages"; -import { CardTitleLines, CardTitleStatus } from "./OrderCardTitle"; +import { CardTitleStatus } from "./OrderCardTitle"; export const getOrderTitleMessage = (status: CardTitleStatus) => orderTitleMessages[camelCase(status)] || orderTitleMessages.unfulfilled; - -export const getFulfillmentTotalQuantity = ( - lines: CardTitleLines, - status: CardTitleStatus, -) => - status === "unfulfilled" - ? lines.reduce( - (resultQuantity, line) => - resultQuantity + (line.quantityToFulfill ?? line.quantity), - 0, - ) - : lines.reduce( - (resultQuantity, { quantity }) => resultQuantity + quantity, - 0, - ); diff --git a/src/orders/components/OrderFulfilledProductsCard/OrderFulfilledProductsCard.tsx b/src/orders/components/OrderFulfilledProductsCard/OrderFulfilledProductsCard.tsx index d9e188ee713..d2d744184ac 100644 --- a/src/orders/components/OrderFulfilledProductsCard/OrderFulfilledProductsCard.tsx +++ b/src/orders/components/OrderFulfilledProductsCard/OrderFulfilledProductsCard.tsx @@ -69,7 +69,6 @@ const OrderFulfilledProductsCard: React.FC< = ({ diff --git a/src/orders/components/OrderReturnPage/components/ItemsCard/ItemsCard.tsx b/src/orders/components/OrderReturnPage/components/ItemsCard/ItemsCard.tsx index 2fe59f1c25a..f352a9c0e66 100644 --- a/src/orders/components/OrderReturnPage/components/ItemsCard/ItemsCard.tsx +++ b/src/orders/components/OrderReturnPage/components/ItemsCard/ItemsCard.tsx @@ -70,7 +70,6 @@ export const ItemsCard: React.FC = ({ diff --git a/src/orders/components/OrderUnfulfilledProductsCard/OrderUnfulfilledProductsCard.tsx b/src/orders/components/OrderUnfulfilledProductsCard/OrderUnfulfilledProductsCard.tsx index dea61da1fb8..05e3225c90f 100644 --- a/src/orders/components/OrderUnfulfilledProductsCard/OrderUnfulfilledProductsCard.tsx +++ b/src/orders/components/OrderUnfulfilledProductsCard/OrderUnfulfilledProductsCard.tsx @@ -39,7 +39,6 @@ const OrderUnfulfilledProductsCard: React.FC< <>