From 211997b137b64ad1c21bc4fc138195ce51d98ce4 Mon Sep 17 00:00:00 2001 From: Kasper Fabricius Kristensen <45367945+kasperkristensen@users.noreply.github.com> Date: Thu, 6 Feb 2025 18:14:50 +0100 Subject: [PATCH] fix(dashboard): Remove wrongful import of utils function (#11338) Resolves SUP-819 --- .changeset/few-queens-unite.md | 5 +++++ packages/admin/dashboard/src/lib/order-helpers.ts | 6 +++--- .../order-general-section/order-general-section.tsx | 5 ++--- 3 files changed, 10 insertions(+), 6 deletions(-) create mode 100644 .changeset/few-queens-unite.md diff --git a/.changeset/few-queens-unite.md b/.changeset/few-queens-unite.md new file mode 100644 index 0000000000..22de7b00c5 --- /dev/null +++ b/.changeset/few-queens-unite.md @@ -0,0 +1,5 @@ +--- +"@medusajs/dashboard": patch +--- + +fix(dashboard): Remove wrongful import of utils function diff --git a/packages/admin/dashboard/src/lib/order-helpers.ts b/packages/admin/dashboard/src/lib/order-helpers.ts index 87e3462e0e..5fee3f1729 100644 --- a/packages/admin/dashboard/src/lib/order-helpers.ts +++ b/packages/admin/dashboard/src/lib/order-helpers.ts @@ -3,12 +3,12 @@ import { TFunction } from "i18next" export const getCanceledOrderStatus = ( t: TFunction<"translation">, status: string -) => { +): { label: string; color: "red" } | null => { if (status === "canceled") { return { label: t("orders.status.canceled"), color: "red" } } - return + return null } export const getOrderPaymentStatus = ( @@ -35,7 +35,7 @@ export const getOrderPaymentStatus = ( ], canceled: [t("orders.payment.status.canceled"), "red"], requires_action: [t("orders.payment.status.requiresAction"), "orange"], - }[status] + }[status] as [string, "red" | "orange" | "green"] return { label, color } } diff --git a/packages/admin/dashboard/src/routes/orders/order-detail/components/order-general-section/order-general-section.tsx b/packages/admin/dashboard/src/routes/orders/order-detail/components/order-general-section/order-general-section.tsx index 54f5c81bc5..307aa818a0 100644 --- a/packages/admin/dashboard/src/routes/orders/order-detail/components/order-general-section/order-general-section.tsx +++ b/packages/admin/dashboard/src/routes/orders/order-detail/components/order-general-section/order-general-section.tsx @@ -10,7 +10,6 @@ import { usePrompt, } from "@medusajs/ui" import { useTranslation } from "react-i18next" -import { isPresent } from "../../../../../../../../core/utils/src/common/is-present" import { ActionMenu } from "../../../../../components/common/action-menu" import { useCancelOrder } from "../../../../../hooks/api/orders" import { useDate } from "../../../../../hooks/use-date" @@ -125,8 +124,8 @@ const OrderBadge = ({ order }: { order: HttpTypes.AdminOrder }) => { const { t } = useTranslation() const orderStatus = getCanceledOrderStatus(t, order.status) - if (!isPresent(orderStatus)) { - return + if (!orderStatus) { + return null } return (