Skip to content

Commit

Permalink
Remove brackets next to order status title (#4736)
Browse files Browse the repository at this point in the history
* Remove brackets

* Changeset add
  • Loading branch information
poulch authored Mar 19, 2024
1 parent 470bc89 commit a9745e4
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 26 deletions.
5 changes: 5 additions & 0 deletions .changeset/famous-grapes-stare.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"saleor-dashboard": minor
---

Remove brackets next to each order status title due to cause confusing for the clients
8 changes: 2 additions & 6 deletions src/orders/components/OrderCardTitle/OrderCardTitle.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand All @@ -19,7 +19,6 @@ export type CardTitleLines = Array<{
}>;

interface OrderCardTitleProps {
lines?: CardTitleLines;
fulfillmentOrder?: number;
status: CardTitleStatus;
toolbar?: React.ReactNode;
Expand Down Expand Up @@ -51,7 +50,6 @@ const selectStatus = (status: CardTitleStatus) => {
};

const OrderCardTitle: React.FC<OrderCardTitleProps> = ({
lines = [],
status,
warehouseName,
withStatus = false,
Expand All @@ -63,8 +61,6 @@ const OrderCardTitle: React.FC<OrderCardTitleProps> = ({

const messageForStatus = getOrderTitleMessage(status);

const totalQuantity = getFulfillmentTotalQuantity(lines, status);

return (
<DefaultCardTitle
toolbar={toolbar}
Expand All @@ -78,7 +74,7 @@ const OrderCardTitle: React.FC<OrderCardTitleProps> = ({
)}
<HorizontalSpacer spacing={2} />
<Typography className={classes.cardHeader}>
{intl.formatMessage(messageForStatus)} ({totalQuantity})
{intl.formatMessage(messageForStatus)}
</Typography>
{!!warehouseName && (
<Typography className={classes.warehouseName} variant="caption">
Expand Down
17 changes: 1 addition & 16 deletions src/orders/components/OrderCardTitle/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
);
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ const OrderFulfilledProductsCard: React.FC<
<Box data-test-id={dataTestId}>
<OrderCardTitle
withStatus
lines={fulfillment?.lines}
fulfillmentOrder={fulfillment?.fulfillmentOrder}
status={fulfillment?.status}
warehouseName={fulfillment?.warehouse?.name}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,6 @@ const ItemsCard: React.FC<OrderReturnRefundLinesCardProps> = ({
<Card>
<OrderCardTitle
orderNumber={order?.number}
lines={lines}
fulfillmentOrder={fulfillment?.fulfillmentOrder}
status={fulfillment?.status}
/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ export const ItemsCard: React.FC<OrderReturnRefundLinesCardProps> = ({
<Card>
<OrderCardTitle
orderNumber={order?.number}
lines={lines}
fulfillmentOrder={fulfillment?.fulfillmentOrder}
status={fulfillment?.status}
/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ const OrderUnfulfilledProductsCard: React.FC<
<>
<Card>
<OrderCardTitle
lines={lines}
withStatus
status="unfulfilled"
className={classes.cardTitle}
Expand Down

0 comments on commit a9745e4

Please sign in to comment.