@@ -90,6 +91,7 @@ const useVariantPriceGridColumns = ({
if (context.column.id?.startsWith("currency_prices")) {
return `variants.${context.row.index}.prices.${value}`
}
+
return `variants.${context.row.index}.prices.${value}`
},
t,
diff --git a/src/routes/products/product-attributes/components/product-attributes-form/product-attributes-form.tsx b/src/routes/products/product-attributes/components/product-attributes-form/product-attributes-form.tsx
index 1ddca9e6..e915b18f 100644
--- a/src/routes/products/product-attributes/components/product-attributes-form/product-attributes-form.tsx
+++ b/src/routes/products/product-attributes/components/product-attributes-form/product-attributes-form.tsx
@@ -1,4 +1,3 @@
-import { HttpTypes } from "@medusajs/types"
import { Button, Input } from "@medusajs/ui"
import { useTranslation } from "react-i18next"
import * as zod from "zod"
@@ -12,9 +11,10 @@ import {
} from "../../../../../dashboard-app"
import { useUpdateProduct } from "../../../../../hooks/api/products"
import { useExtension } from "../../../../../providers/extension-provider"
+import type { ExtendedAdminProduct } from "@custom-types/product"
type ProductAttributesFormProps = {
- product: HttpTypes.AdminProduct
+ product: ExtendedAdminProduct
}
const dimension = zod
@@ -23,6 +23,7 @@ const dimension = zod
if (value === "") {
return null
}
+
return Number(value)
})
.optional()
diff --git a/src/routes/products/product-create-option/components/create-product-option-form/create-product-option-form.tsx b/src/routes/products/product-create-option/components/create-product-option-form/create-product-option-form.tsx
index 05c8b85c..53345939 100644
--- a/src/routes/products/product-create-option/components/create-product-option-form/create-product-option-form.tsx
+++ b/src/routes/products/product-create-option/components/create-product-option-form/create-product-option-form.tsx
@@ -4,15 +4,15 @@ import { useForm } from "react-hook-form"
import { useTranslation } from "react-i18next"
import { z } from "zod"
-import { HttpTypes } from "@medusajs/types"
import { Form } from "../../../../../components/common/form"
import { ChipInput } from "../../../../../components/inputs/chip-input"
import { RouteDrawer, useRouteModal } from "../../../../../components/modals"
import { KeyboundForm } from "../../../../../components/utilities/keybound-form"
import { useCreateProductOption } from "../../../../../hooks/api/products"
+import type { ExtendedAdminProduct } from "@custom-types/product"
type EditProductOptionsFormProps = {
- product: HttpTypes.AdminProduct
+ product: ExtendedAdminProduct
}
const CreateProductOptionSchema = z.object({
diff --git a/src/routes/products/product-create-variant/components/create-product-variant-form/create-product-variant-form.tsx b/src/routes/products/product-create-variant/components/create-product-variant-form/create-product-variant-form.tsx
index e5aaa404..2ad4071d 100644
--- a/src/routes/products/product-create-variant/components/create-product-variant-form/create-product-variant-form.tsx
+++ b/src/routes/products/product-create-variant/components/create-product-variant-form/create-product-variant-form.tsx
@@ -5,7 +5,7 @@ import { useFieldArray, useForm, useWatch } from "react-hook-form"
import { useTranslation } from "react-i18next"
import { z } from "zod"
-import { AdminCreateProductVariantPrice, HttpTypes } from "@medusajs/types"
+import { AdminCreateProductVariantPrice } from "@medusajs/types"
import {
RouteDrawer,
RouteFocusModal,
@@ -27,6 +27,7 @@ import DetailsTab from "./details-tab"
import InventoryKitTab from "./inventory-kit-tab"
import PricingTab from "./pricing-tab"
import { useDocumentDirection } from "../../../../../hooks/use-document-direction"
+import { ExtendedAdminProduct } from "@custom-types/product"
enum Tab {
DETAIL = "detail",
@@ -43,7 +44,7 @@ const initialTabState: TabState = {
}
type CreateProductVariantFormProps = {
- product: HttpTypes.AdminProduct
+ product: ExtendedAdminProduct
}
export const CreateProductVariantForm = ({
@@ -79,6 +80,7 @@ export const CreateProductVariantForm = ({
return regions.reduce(
(acc, reg) => {
acc[reg.id] = reg.currency_code
+
return acc
},
{} as Record
@@ -104,10 +106,10 @@ export const CreateProductVariantForm = ({
const tabOrder = useMemo(() => {
if (inventoryTabEnabled) {
- return [Tab.DETAIL, Tab.PRICE, Tab.INVENTORY] as const
+ return [Tab.DETAIL, Tab.PRICE, Tab.INVENTORY]
}
- return [Tab.DETAIL, Tab.PRICE] as const
+ return [Tab.DETAIL, Tab.PRICE]
}, [inventoryTabEnabled])
useEffect(() => {
@@ -134,6 +136,7 @@ export const CreateProductVariantForm = ({
}))
setTab(update)
+
return
}
@@ -155,6 +158,7 @@ export const CreateProductVariantForm = ({
[tab]: "in-progress",
}))
setTab(tab)
+
return
}
@@ -219,17 +223,22 @@ export const CreateProductVariantForm = ({
return undefined
}
- const ret: AdminCreateProductVariantPrice = {}
const amount = castNumber(value)
+ let currency_code: string
+ let rules: AdminCreateProductVariantPrice["rules"] | undefined
if (currencyOrRegion.startsWith("reg_")) {
- ret.rules = { region_id: currencyOrRegion }
- ret.currency_code = regionsCurrencyMap[currencyOrRegion]
+ rules = { region_id: currencyOrRegion }
+ currency_code = regionsCurrencyMap[currencyOrRegion]
} else {
- ret.currency_code = currencyOrRegion
+ currency_code = currencyOrRegion
}
- ret.amount = amount
+ const ret: AdminCreateProductVariantPrice = {
+ currency_code,
+ amount,
+ ...(rules && { rules }),
+ }
return ret
})
diff --git a/src/routes/products/product-create-variant/components/create-product-variant-form/details-tab.tsx b/src/routes/products/product-create-variant/components/create-product-variant-form/details-tab.tsx
index dcdf2ced..d6b7994e 100644
--- a/src/routes/products/product-create-variant/components/create-product-variant-form/details-tab.tsx
+++ b/src/routes/products/product-create-variant/components/create-product-variant-form/details-tab.tsx
@@ -3,14 +3,13 @@ import { UseFormReturn, useWatch } from "react-hook-form"
import { useTranslation } from "react-i18next"
import { z } from "zod"
-import { HttpTypes } from "@medusajs/types"
-
import { Form } from "../../../../../components/common/form"
import { Combobox } from "../../../../../components/inputs/combobox"
import { CreateProductVariantSchema } from "./constants"
+import { ExtendedAdminProduct } from "@custom-types/product"
type DetailsTabProps = {
- product: HttpTypes.AdminProduct
+ product: ExtendedAdminProduct
form: UseFormReturn>
}
@@ -60,7 +59,7 @@ function DetailsTab({ form, product }: DetailsTabProps) {
}}
/>
- {product.options?.map((option: any) => (
+ {product.options?.map((option) => (
({
+ options={option.values?.map((v) => ({
label: v.value,
value: v.value,
- }))}
+ })) ?? []}
/>
diff --git a/src/routes/products/product-create-variant/components/create-product-variant-form/inventory-kit-tab.tsx b/src/routes/products/product-create-variant/components/create-product-variant-form/inventory-kit-tab.tsx
index 9d04cfcb..925e4fb2 100644
--- a/src/routes/products/product-create-variant/components/create-product-variant-form/inventory-kit-tab.tsx
+++ b/src/routes/products/product-create-variant/components/create-product-variant-form/inventory-kit-tab.tsx
@@ -1,15 +1,15 @@
-import { z } from "zod"
-import { useFieldArray, UseFormReturn } from "react-hook-form"
+import type { z } from "zod"
+import { useFieldArray, type UseFormReturn } from "react-hook-form"
import { Button, Heading, IconButton, Input, Label } from "@medusajs/ui"
-import { CreateProductVariantSchema } from "./constants"
+import type { CreateProductVariantSchema } from "./constants"
import { XMarkMini } from "@medusajs/icons"
import { useTranslation } from "react-i18next"
-import { useComboboxData } from "../../../../../hooks/use-combobox-data"
-import { sdk } from "../../../../../lib/client"
-import { Form } from "../../../../../components/common/form"
-import { Combobox } from "../../../../../components/inputs/combobox"
+import { useComboboxData } from "@hooks/use-combobox-data"
+import { sdk } from "@lib/client"
+import { Form } from "@components/common/form"
+import { Combobox } from "@components/inputs/combobox"
type InventoryKitTabProps = {
form: UseFormReturn>
@@ -30,7 +30,7 @@ function InventoryKitTab({ form }: InventoryKitTabProps) {
queryFn: (params) => sdk.admin.inventoryItem.list(params),
getOptions: (data) =>
data.inventory_items.map((item) => ({
- label: item.title,
+ label: item.title || item.sku || item.id,
value: item.id,
})),
})
diff --git a/src/routes/products/product-create-variant/components/create-product-variant-form/pricing-tab.tsx b/src/routes/products/product-create-variant/components/create-product-variant-form/pricing-tab.tsx
index a10850c2..4fd1d11e 100644
--- a/src/routes/products/product-create-variant/components/create-product-variant-form/pricing-tab.tsx
+++ b/src/routes/products/product-create-variant/components/create-product-variant-form/pricing-tab.tsx
@@ -1,18 +1,18 @@
import { useMemo } from "react"
-import { UseFormReturn, useWatch } from "react-hook-form"
-import { HttpTypes } from "@medusajs/types"
+import { type UseFormReturn, useWatch } from "react-hook-form"
+import type { HttpTypes } from "@medusajs/types"
import { useTranslation } from "react-i18next"
-import { z } from "zod"
+import type { z } from "zod"
-import { CreateProductVariantSchema } from "./constants"
-import { useRegions, useStore } from "../../../../../hooks/api"
-import { usePricePreferences } from "../../../../../hooks/api/price-preferences"
-import { useRouteModal } from "../../../../../components/modals"
+import type { CreateProductVariantSchema } from "./constants"
+import { useRegions, useStore } from "@hooks/api"
+import { usePricePreferences } from "@hooks/api/price-preferences"
+import { useRouteModal } from "@components/modals"
import {
createDataGridHelper,
createDataGridPriceColumns,
DataGrid,
-} from "../../../../../components/data-grid"
+} from "@components/data-grid"
type PricingTabProps = {
form: UseFormReturn>
@@ -33,10 +33,10 @@ function PricingTab({ form }: PricingTabProps) {
const variant = useWatch({
control: form.control,
- }) as any
+ }) as z.infer
return (
- , z.infer>
columns={columns}
data={[variant]}
state={form}
@@ -46,7 +46,7 @@ function PricingTab({ form }: PricingTabProps) {
}
const columnHelper = createDataGridHelper<
- HttpTypes.AdminProductVariant,
+ z.infer,
z.infer
>()
@@ -68,6 +68,7 @@ const useVariantPriceGridColumns = ({
header: t("fields.title"),
cell: (context) => {
const entity = context.row.original
+
return (
@@ -194,10 +196,10 @@ type Media = {
isThumbnail: boolean
}
-const getMedia = (product: Product) => {
+const getMedia = (product: ExtendedAdminProduct) => {
const { images = [], thumbnail } = product
- const media: Media[] = images.map((image) => ({
+ const media: Media[] = (images || []).map((image) => ({
id: image.id,
url: image.url,
isThumbnail: image.url === thumbnail,
diff --git a/src/routes/products/product-detail/components/product-option-section/product-option-section.tsx b/src/routes/products/product-detail/components/product-option-section/product-option-section.tsx
index a8ce121f..25d3bb10 100644
--- a/src/routes/products/product-detail/components/product-option-section/product-option-section.tsx
+++ b/src/routes/products/product-detail/components/product-option-section/product-option-section.tsx
@@ -4,13 +4,14 @@ import { useTranslation } from "react-i18next"
import { ActionMenu } from "../../../../../components/common/action-menu"
import { SectionRow } from "../../../../../components/common/section"
import { useDeleteProductOption } from "../../../../../hooks/api/products"
-import { HttpTypes } from "@medusajs/types"
+import type { HttpTypes } from "@medusajs/types"
+import type { ExtendedAdminProduct } from "@custom-types/product";
const OptionActions = ({
product,
option,
}: {
- product: HttpTypes.AdminProduct
+ product: ExtendedAdminProduct
option: HttpTypes.AdminProductOption
}) => {
const { t } = useTranslation()
@@ -62,7 +63,7 @@ const OptionActions = ({
}
type ProductOptionSectionProps = {
- product: HttpTypes.AdminProduct
+ product: ExtendedAdminProduct
}
export const ProductOptionSection = ({
diff --git a/src/routes/products/product-detail/components/product-organization-section/product-organization-section.tsx b/src/routes/products/product-detail/components/product-organization-section/product-organization-section.tsx
index 12bdf963..8ae36459 100644
--- a/src/routes/products/product-detail/components/product-organization-section/product-organization-section.tsx
+++ b/src/routes/products/product-detail/components/product-organization-section/product-organization-section.tsx
@@ -1,14 +1,14 @@
import { PencilSquare } from "@medusajs/icons"
-import { HttpTypes } from "@medusajs/types"
import { Badge, Container, Heading, Tooltip } from "@medusajs/ui"
import { useTranslation } from "react-i18next"
import { Link } from "react-router-dom"
-import { ActionMenu } from "../../../../../components/common/action-menu"
-import { SectionRow } from "../../../../../components/common/section"
-import { useExtension } from "../../../../../providers/extension-provider"
+import { ActionMenu } from "@components/common/action-menu"
+import { SectionRow } from "@components/common/section"
+import { useExtension } from "@providers/extension-provider"
+import type { ExtendedAdminProduct } from "@custom-types/product"
type ProductOrganizationSectionProps = {
- product: HttpTypes.AdminProduct
+ product: ExtendedAdminProduct
}
export const ProductOrganizationSection = ({
diff --git a/src/routes/products/product-detail/components/product-sales-channel-section/product-sales-channel-section.tsx b/src/routes/products/product-detail/components/product-sales-channel-section/product-sales-channel-section.tsx
index ef046d0f..1d3d4368 100644
--- a/src/routes/products/product-detail/components/product-sales-channel-section/product-sales-channel-section.tsx
+++ b/src/routes/products/product-detail/components/product-sales-channel-section/product-sales-channel-section.tsx
@@ -3,10 +3,10 @@ import { Container, Heading, Text, Tooltip } from "@medusajs/ui"
import { Trans, useTranslation } from "react-i18next"
import { ActionMenu } from "../../../../../components/common/action-menu"
import { useSalesChannels } from "../../../../../hooks/api/sales-channels"
-import { HttpTypes } from "@medusajs/types"
+import { ExtendedAdminProduct } from "@custom-types/product"
type ProductSalesChannelSectionProps = {
- product: HttpTypes.AdminProduct
+ product: ExtendedAdminProduct
}
// TODO: The fetched sales channel doesn't contain all necessary info
diff --git a/src/routes/products/product-detail/components/product-shipping-profile-section/product-shipping-profile-section.tsx b/src/routes/products/product-detail/components/product-shipping-profile-section/product-shipping-profile-section.tsx
index 1cfab543..dbae3280 100644
--- a/src/routes/products/product-detail/components/product-shipping-profile-section/product-shipping-profile-section.tsx
+++ b/src/routes/products/product-detail/components/product-shipping-profile-section/product-shipping-profile-section.tsx
@@ -1,15 +1,13 @@
import { PencilSquare, ShoppingBag } from "@medusajs/icons"
-import { HttpTypes } from "@medusajs/types"
import { Container, Heading } from "@medusajs/ui"
import { useTranslation } from "react-i18next"
-import { SidebarLink } from "../../../../../components/common/sidebar-link/sidebar-link"
-import { ActionMenu } from "../../../../../components/common/action-menu"
+import { SidebarLink } from "@components/common/sidebar-link/sidebar-link"
+import { ActionMenu } from "@components/common/action-menu"
+import type { ExtendedAdminProduct } from "@custom-types/product"
type ProductShippingProfileSectionProps = {
- product: HttpTypes.AdminProduct & {
- shipping_profile: HttpTypes.AdminShippingProfile
- }
+ product: ExtendedAdminProduct
}
export const ProductShippingProfileSection = ({
diff --git a/src/routes/products/product-detail/components/product-variant-section/product-variant-section.tsx b/src/routes/products/product-detail/components/product-variant-section/product-variant-section.tsx
index 4452c530..3b18d491 100644
--- a/src/routes/products/product-detail/components/product-variant-section/product-variant-section.tsx
+++ b/src/routes/products/product-detail/components/product-variant-section/product-variant-section.tsx
@@ -1,5 +1,4 @@
import { Buildings, Component, PencilSquare, Trash } from "@medusajs/icons"
-import { HttpTypes } from "@medusajs/types"
import {
Badge,
clx,
@@ -26,9 +25,10 @@ import {
} from "../../../../../hooks/api/products"
import { useQueryParams } from "../../../../../hooks/use-query-params"
import { PRODUCT_VARIANT_IDS_KEY } from "../../../common/constants"
+import type { ExtendedAdminProduct, ExtendedAdminProductVariant } from "@custom-types/product"
type ProductVariantSectionProps = {
- product: HttpTypes.AdminProduct
+ product: ExtendedAdminProduct
}
const PAGE_SIZE = 10
@@ -145,9 +145,9 @@ export const ProductVariantSection = ({
}
const columnHelper =
- createDataTableColumnHelper()
+ createDataTableColumnHelper()
-const useColumns = (product: HttpTypes.AdminProduct) => {
+const useColumns = (product: ExtendedAdminProduct) => {
const { t } = useTranslation()
const navigate = useNavigate()
const { mutateAsync } = useDeleteVariantLazy(product.id)
@@ -161,10 +161,11 @@ const useColumns = (product: HttpTypes.AdminProduct) => {
filtered.append(key, value)
}
}
+
return filtered
}, [searchParams])
- const dateColumns = useDataTableDateColumns()
+ const dateColumns = useDataTableDateColumns()
const handleDelete = useCallback(
async (id: string, title: string) => {
@@ -224,12 +225,10 @@ const useColumns = (product: HttpTypes.AdminProduct) => {
}, [product])
const getActions = useCallback(
- (ctx: CellContext) => {
- const variant = ctx.row.original as HttpTypes.AdminProductVariant & {
- inventory_items: { inventory: HttpTypes.AdminInventoryItem }[]
- }
+ (ctx: CellContext) => {
+ const variant = ctx.row.original
- const mainActions: DataTableAction[] = [
+ const mainActions: DataTableAction[] = [
{
icon: [] =
+ const secondaryActions: DataTableAction[] =
[
{
icon: ()
+ createDataTableFilterHelper()
const useFilters = () => {
const { t } = useTranslation()
diff --git a/src/routes/products/product-detail/constants.ts b/src/routes/products/product-detail/constants.ts
index e5f98171..1da24443 100644
--- a/src/routes/products/product-detail/constants.ts
+++ b/src/routes/products/product-detail/constants.ts
@@ -2,5 +2,5 @@ import { getLinkedFields } from "../../../dashboard-app"
export const PRODUCT_DETAIL_FIELDS = getLinkedFields(
"product",
- "*categories,*shipping_profile,-variants"
+ "*categories,*shipping_profile,*variants"
)
diff --git a/src/routes/products/product-detail/loader.ts b/src/routes/products/product-detail/loader.ts
index fa1375a7..19482aec 100644
--- a/src/routes/products/product-detail/loader.ts
+++ b/src/routes/products/product-detail/loader.ts
@@ -4,11 +4,12 @@ import { productsQueryKeys } from "../../../hooks/api/products"
import { sdk } from "../../../lib/client"
import { queryClient } from "../../../lib/query-client"
import { PRODUCT_DETAIL_FIELDS } from "./constants"
+import type { ExtendedAdminProductResponse } from "@custom-types/product"
const productDetailQuery = (id: string) => ({
queryKey: productsQueryKeys.detail(id, { fields: PRODUCT_DETAIL_FIELDS }),
queryFn: async () =>
- sdk.admin.product.retrieve(id, { fields: PRODUCT_DETAIL_FIELDS }),
+ sdk.admin.product.retrieve(id, { fields: PRODUCT_DETAIL_FIELDS }) as Promise,
})
export const productLoader = async ({ params }: LoaderFunctionArgs) => {
diff --git a/src/routes/products/product-detail/product-detail.tsx b/src/routes/products/product-detail/product-detail.tsx
index 9702aadc..40f7539c 100644
--- a/src/routes/products/product-detail/product-detail.tsx
+++ b/src/routes/products/product-detail/product-detail.tsx
@@ -29,7 +29,7 @@ export const ProductDetail = () => {
initialData: initialData,
},
);
-
+console.log(product, 'PRODUCT')
const { getWidgets } = useExtension();
const after = getWidgets("product.details.after");
diff --git a/src/routes/products/product-edit-option/components/edit-product-option-form/edit-product-option-form.tsx b/src/routes/products/product-edit-option/components/edit-product-option-form/edit-product-option-form.tsx
index 0a816040..52074270 100644
--- a/src/routes/products/product-edit-option/components/edit-product-option-form/edit-product-option-form.tsx
+++ b/src/routes/products/product-edit-option/components/edit-product-option-form/edit-product-option-form.tsx
@@ -4,12 +4,12 @@ import { useForm } from "react-hook-form"
import { useTranslation } from "react-i18next"
import { z } from "zod"
-import { HttpTypes } from "@medusajs/types"
-import { Form } from "../../../../../components/common/form"
-import { ChipInput } from "../../../../../components/inputs/chip-input"
-import { RouteDrawer, useRouteModal } from "../../../../../components/modals"
-import { KeyboundForm } from "../../../../../components/utilities/keybound-form"
-import { useUpdateProductOption } from "../../../../../hooks/api/products"
+import type { HttpTypes } from "@medusajs/types"
+import { Form } from "@components/common/form"
+import { ChipInput } from "@components/inputs/chip-input"
+import { RouteDrawer, useRouteModal } from "@components/modals"
+import { KeyboundForm } from "@components/utilities/keybound-form"
+import { useUpdateProductOption } from "@hooks/api/products"
type EditProductOptionFormProps = {
option: HttpTypes.AdminProductOption
@@ -29,7 +29,7 @@ export const CreateProductOptionForm = ({
const form = useForm>({
defaultValues: {
title: option.title,
- values: option.values.map((v: any) => v.value),
+ values: option.values?.map((v) => v.value) ?? [],
},
resolver: zodResolver(CreateProductOptionSchema),
})
diff --git a/src/routes/products/product-edit-option/product-edit-option.tsx b/src/routes/products/product-edit-option/product-edit-option.tsx
index 84f10ed9..155fe20c 100644
--- a/src/routes/products/product-edit-option/product-edit-option.tsx
+++ b/src/routes/products/product-edit-option/product-edit-option.tsx
@@ -1,8 +1,8 @@
import { Heading } from "@medusajs/ui"
import { useTranslation } from "react-i18next"
import { json, useParams } from "react-router-dom"
-import { RouteDrawer } from "../../../components/modals"
-import { useProduct } from "../../../hooks/api/products"
+import { RouteDrawer } from "@components/modals"
+import { useProduct } from "@hooks/api/products"
import { CreateProductOptionForm } from "./components/edit-product-option-form"
export const ProductEditOption = () => {
diff --git a/src/routes/products/product-edit/components/edit-product-form/edit-product-form.tsx b/src/routes/products/product-edit/components/edit-product-form/edit-product-form.tsx
index 1aeec666..1d7b8b98 100644
--- a/src/routes/products/product-edit/components/edit-product-form/edit-product-form.tsx
+++ b/src/routes/products/product-edit/components/edit-product-form/edit-product-form.tsx
@@ -1,22 +1,21 @@
-import { HttpTypes } from "@medusajs/types";
import { Button, Input, Select, Text, Textarea, toast } from "@medusajs/ui";
import { useTranslation } from "react-i18next";
import * as zod from "zod";
-import { Form } from "../../../../../components/common/form";
-import { SwitchBox } from "../../../../../components/common/switch-box";
-import { RouteDrawer, useRouteModal } from "../../../../../components/modals";
-import { KeyboundForm } from "../../../../../components/utilities/keybound-form";
-import { FormExtensionZone } from "../../../../../dashboard-app";
-import { useExtendableForm } from "../../../../../dashboard-app/forms/hooks";
-import { useUpdateProduct } from "../../../../../hooks/api/products";
-import { useDocumentDirection } from "../../../../../hooks/use-document-direction";
-import { transformNullableFormData } from "../../../../../lib/form-helpers";
-import { useExtension } from "../../../../../providers/extension-provider";
+import { Form } from "@components/common/form";
+import { SwitchBox } from "@components/common/switch-box";
+import { RouteDrawer, useRouteModal } from "@components/modals";
+import { KeyboundForm } from "@components/utilities/keybound-form";
+import { useUpdateProduct } from "@hooks/api/products";
+import { useDocumentDirection } from "@hooks/use-document-direction";
+import { transformNullableFormData } from "@lib/form-helpers";
+import { useExtension } from "@providers/extension-provider";
+import { FormExtensionZone, useExtendableForm } from "@/dashboard-app";
+import type { ExtendedAdminProduct } from "@custom-types/product";
type EditProductFormProps = {
- product: HttpTypes.AdminProduct;
+ product: ExtendedAdminProduct;
};
const EditProductSchema = zod.object({
@@ -64,7 +63,7 @@ export const EditProductForm = ({ product }: EditProductFormProps) => {
title,
discountable,
handle,
- status: status as HttpTypes.AdminProductStatus,
+ status: status,
...nullableData,
},
{
diff --git a/src/routes/products/product-edit/product-edit.tsx b/src/routes/products/product-edit/product-edit.tsx
index 3648035c..c9d2dead 100644
--- a/src/routes/products/product-edit/product-edit.tsx
+++ b/src/routes/products/product-edit/product-edit.tsx
@@ -2,8 +2,8 @@ import { Heading } from "@medusajs/ui"
import { useTranslation } from "react-i18next"
import { useParams } from "react-router-dom"
-import { RouteDrawer } from "../../../components/modals"
-import { useProduct } from "../../../hooks/api/products"
+import { RouteDrawer } from "@components/modals"
+import { useProduct } from "@hooks/api/products"
import { PRODUCT_DETAIL_FIELDS } from "../product-detail/constants"
import { EditProductForm } from "./components/edit-product-form"
diff --git a/src/routes/products/product-list/components/product-list-table/product-list-table.tsx b/src/routes/products/product-list/components/product-list-table/product-list-table.tsx
index 05af2fab..8b2a07dc 100644
--- a/src/routes/products/product-list/components/product-list-table/product-list-table.tsx
+++ b/src/routes/products/product-list/components/product-list-table/product-list-table.tsx
@@ -6,7 +6,6 @@ import { useMemo } from "react"
import { useTranslation } from "react-i18next"
import { Link, Outlet, useLoaderData, useLocation } from "react-router-dom"
-import { HttpTypes } from "@medusajs/types"
import { ActionMenu } from "../../../../../components/common/action-menu"
import { _DataTable } from "../../../../../components/table/data-table"
import {
@@ -20,6 +19,7 @@ import { useDataTable } from "../../../../../hooks/use-data-table"
import { productsLoader } from "../../loader"
import { useFeatureFlag } from "../../../../../providers/feature-flag-provider"
import { ConfigurableProductListTable } from "./configurable-product-list-table"
+import { ExtendedAdminProduct } from "@custom-types/product"
const PAGE_SIZE = 20
@@ -53,7 +53,7 @@ export const ProductListTable = () => {
const columns = useColumns()
const { table } = useDataTable({
- data: (products ?? []) as HttpTypes.AdminProduct[],
+ data: (products ?? []),
columns,
count,
enablePagination: true,
@@ -108,7 +108,7 @@ export const ProductListTable = () => {
)
}
-const ProductActions = ({ product }: { product: HttpTypes.AdminProduct }) => {
+const ProductActions = ({ product }: { product: ExtendedAdminProduct }) => {
const { t } = useTranslation()
const prompt = usePrompt()
const { mutateAsync } = useDeleteProduct(product.id)
@@ -170,7 +170,7 @@ const ProductActions = ({ product }: { product: HttpTypes.AdminProduct }) => {
)
}
-const columnHelper = createColumnHelper()
+const columnHelper = createColumnHelper()
const useColumns = () => {
const base = useProductTableColumns()
diff --git a/src/routes/products/product-list/components/product-list-table/product-table-adapter.tsx b/src/routes/products/product-list/components/product-list-table/product-table-adapter.tsx
index 3d6f5cfb..5d60ffd1 100644
--- a/src/routes/products/product-list/components/product-list-table/product-table-adapter.tsx
+++ b/src/routes/products/product-list/components/product-list-table/product-table-adapter.tsx
@@ -1,11 +1,11 @@
-import { HttpTypes } from "@medusajs/types"
import { useProducts } from "../../../../../hooks/api/products"
import { productColumnAdapter } from "../../../../../lib/table/entity-adapters"
import { createTableAdapter, TableAdapter } from "../../../../../lib/table/table-adapters"
import { useProductTableFilters } from "./use-product-table-filters"
+import type { ExtendedAdminProduct } from "@custom-types/product"
-export function createProductTableAdapter(): TableAdapter {
- return createTableAdapter({
+export function createProductTableAdapter(): TableAdapter {
+ return createTableAdapter({
entity: "products",
queryPrefix: "p",
pageSize: 20,
@@ -20,16 +20,22 @@ export function createProductTableAdapter(): TableAdapter {
// Only keep placeholder data if the fields haven't changed
- const prevFields = previousQuery?.[previousQuery.length - 1]?.query?.fields
+ const queryKey = previousQuery?.queryKey
+ const prevFields = Array.isArray(queryKey)
+ ? (queryKey[queryKey.length - 1] as { query?: { fields?: string } } | undefined)?.query?.fields
+ : undefined
+
if (prevFields && prevFields !== fields) {
// Fields changed, don't use placeholder data
return undefined
}
+
// Fields are the same, keep previous data for smooth transitions
return previousData
},
}
)
+
return { data: products, count, isLoading, isError, error }
},
getRowHref: (row) => `/products/${row.id}`,
@@ -39,7 +45,7 @@ export function createProductTableAdapter(): TableAdapter {
+export function useProductTableAdapter(): TableAdapter {
const filters = useProductTableFilters()
const adapter = createProductTableAdapter()
diff --git a/src/routes/products/product-list/components/product-list-table/use-product-table-filters.tsx b/src/routes/products/product-list/components/product-list-table/use-product-table-filters.tsx
index 009eeafa..9ba5c007 100644
--- a/src/routes/products/product-list/components/product-list-table/use-product-table-filters.tsx
+++ b/src/routes/products/product-list/components/product-list-table/use-product-table-filters.tsx
@@ -1,13 +1,15 @@
import { useMemo } from "react"
import { useTranslation } from "react-i18next"
import { createDataTableFilterHelper } from "@medusajs/ui"
-import { HttpTypes } from "@medusajs/types"
import { useDataTableDateFilters } from "../../../../../components/data-table/helpers/general/use-data-table-date-filters"
import { useProductTypes } from "../../../../../hooks/api/product-types"
import { useProductTags } from "../../../../../hooks/api"
import { useSalesChannels } from "../../../../../hooks/api/sales-channels"
+import type { ExtendedAdminProductListParams } from "@custom-types/product"
-const filterHelper = createDataTableFilterHelper()
+const filterHelper = createDataTableFilterHelper()
+
+// const filterHelper = createDataTableFilterHelper()
/**
* Hook to create filters in the format expected by @medusajs/ui DataTable
diff --git a/src/routes/products/product-list/loader.ts b/src/routes/products/product-list/loader.ts
index 60eb724f..1f07eca3 100644
--- a/src/routes/products/product-list/loader.ts
+++ b/src/routes/products/product-list/loader.ts
@@ -1,9 +1,9 @@
import { QueryClient } from "@tanstack/react-query"
-import { HttpTypes } from "@medusajs/types"
import { productsQueryKeys } from "../../../hooks/api/products"
import { sdk } from "../../../lib/client"
import { queryClient } from "../../../lib/query-client"
+import { ExtendedAdminProductListResponse } from "@custom-types/product"
const productsListQuery = () => ({
queryKey: productsQueryKeys.list({
@@ -12,7 +12,7 @@ const productsListQuery = () => ({
is_giftcard: false,
}),
queryFn: async () =>
- sdk.admin.product.list({ limit: 20, offset: 0, is_giftcard: false }),
+ sdk.admin.product.list({ limit: 20, offset: 0, is_giftcard: false }) as Promise,
})
export const productsLoader = (client: QueryClient) => {
@@ -20,7 +20,7 @@ export const productsLoader = (client: QueryClient) => {
const query = productsListQuery()
return (
- queryClient.getQueryData(
+ queryClient.getQueryData(
query.queryKey
) ?? (await client.fetchQuery(query))
)
diff --git a/src/routes/products/product-media/components/edit-product-media-form/edit-product-media-form.tsx b/src/routes/products/product-media/components/edit-product-media-form/edit-product-media-form.tsx
index 74cc32a9..725c4725 100644
--- a/src/routes/products/product-media/components/edit-product-media-form/edit-product-media-form.tsx
+++ b/src/routes/products/product-media/components/edit-product-media-form/edit-product-media-form.tsx
@@ -1,7 +1,7 @@
import { Fragment, useCallback, useState } from "react";
import { ThumbnailBadge } from "@medusajs/icons";
-import { HttpTypes } from "@medusajs/types";
+import type { HttpTypes } from "@medusajs/types";
import {
Button,
Checkbox,
@@ -51,9 +51,10 @@ import {
MediaSchema,
} from "../../../product-create/constants";
import { EditProductMediaSchemaType } from "../../../product-create/types";
+import type { ExtendedAdminProduct } from "@custom-types/product";
type ProductMediaViewProps = {
- product: HttpTypes.AdminProduct;
+ product: ExtendedAdminProduct;
};
type Media = z.infer;
@@ -125,6 +126,7 @@ export const EditProductMediaForm = ({ product }: ProductMediaViewProps) => {
type: "invalid_file",
message: t("products.media.failedToUpload"),
});
+
return { files: [] };
});
uploaded = uploads;
@@ -135,6 +137,7 @@ export const EditProductMediaForm = ({ product }: ProductMediaViewProps) => {
if (toUploadIndex > -1) {
return { ...entry, url: uploaded[toUploadIndex]?.url };
}
+
return entry;
});
const thumbnail = withUpdatedUrls.find((m) => m.isThumbnail)?.url;
@@ -160,8 +163,12 @@ export const EditProductMediaForm = ({ product }: ProductMediaViewProps) => {
(id: string) => {
return (val: boolean) => {
if (!val) {
- const { [id]: _, ...rest } = selection;
- setSelection(rest);
+ setSelection(prev => {
+ const next = { ...prev };
+ delete next[id];
+
+ return next;
+ });
} else {
setSelection((prev) => ({ ...prev, [id]: true }));
}
diff --git a/src/routes/products/product-media/components/product-media-gallery/product-media-gallery.tsx b/src/routes/products/product-media/components/product-media-gallery/product-media-gallery.tsx
index 5147dc04..223f6b42 100644
--- a/src/routes/products/product-media/components/product-media-gallery/product-media-gallery.tsx
+++ b/src/routes/products/product-media/components/product-media-gallery/product-media-gallery.tsx
@@ -10,12 +10,12 @@ import { useCallback, useEffect, useState } from "react"
import { useTranslation } from "react-i18next"
import { Link, useLocation } from "react-router-dom"
-import { HttpTypes } from "@medusajs/types"
-import { RouteFocusModal } from "../../../../../components/modals"
-import { useUpdateProduct } from "../../../../../hooks/api/products"
+import { RouteFocusModal } from "@components/modals"
+import { useUpdateProduct } from "@hooks/api/products"
+import type { ExtendedAdminProduct, ExtendedAdminProductImage } from "@custom-types/product"
type ProductMediaGalleryProps = {
- product: HttpTypes.AdminProduct
+ product: ExtendedAdminProduct
}
export const ProductMediaGallery = ({ product }: ProductMediaGalleryProps) => {
@@ -305,7 +305,7 @@ type Media = {
}
const getMedia = (
- images: HttpTypes.AdminProductImage[] | null,
+ images: ExtendedAdminProductImage[] | null,
thumbnail: string | null
) => {
const media: Media[] =
diff --git a/src/routes/products/product-media/components/product-media-view/product-media-view.tsx b/src/routes/products/product-media/components/product-media-view/product-media-view.tsx
index d21b71d8..91fc525e 100644
--- a/src/routes/products/product-media/components/product-media-view/product-media-view.tsx
+++ b/src/routes/products/product-media/components/product-media-view/product-media-view.tsx
@@ -2,10 +2,10 @@ import { useSearchParams } from "react-router-dom"
import { EditProductMediaForm } from "../edit-product-media-form"
import { ProductMediaGallery } from "../product-media-gallery"
import { ProductMediaViewContext } from "./product-media-view-context"
-import { HttpTypes } from "@medusajs/types"
+import type { ExtendedAdminProduct } from "@custom-types/product"
type ProductMediaViewProps = {
- product: HttpTypes.AdminProduct
+ product: ExtendedAdminProduct
}
enum View {
@@ -44,7 +44,7 @@ export const ProductMediaView = ({ product }: ProductMediaViewProps) => {
)
}
-const renderView = (view: View, product: HttpTypes.AdminProduct) => {
+const renderView = (view: View, product: ExtendedAdminProduct) => {
switch (view) {
case View.GALLERY:
return
}
- return regions.reduce((acc, reg) => {
+ return regions.reduce>((acc, reg) => {
acc[reg.id] = reg.currency_code
+
return acc
}, {})
}, [regions])
@@ -56,45 +57,54 @@ export const PricingEdit = ({
const form = useForm({
defaultValues: {
- variants: variants?.map((variant: any) => ({
+ variants: variants?.map((variant) => ({
title: variant.title,
- prices: variant.prices.reduce((acc: any, price: any) => {
+ prices: variant.prices?.reduce>((acc, price) => {
if (price.rules?.region_id) {
acc[price.rules.region_id] = price.amount
} else {
acc[price.currency_code] = price.amount
}
+
return acc
- }, {}),
- })) as any,
+ }, {}) ?? {},
+ })),
},
resolver: zodResolver(UpdateVariantPricesSchema, {}),
})
const handleSubmit = form.handleSubmit(async (values) => {
+ if (!variants) {
+ return
+ }
+
const reqData = values.variants.map((variant, ind) => ({
id: variants[ind].id,
prices: Object.entries(variant.prices || {})
.filter(
- ([_, value]) => value !== "" && typeof value !== "undefined" // deleted cells
+ (entry): entry is [string, string | number] => {
+ const [, value] = entry
+
+ return value !== "" && typeof value !== "undefined"
+ }
)
- .map(([currencyCodeOrRegionId, value]: any) => {
+ .map(([currencyCodeOrRegionId, value]) => {
const regionId = currencyCodeOrRegionId.startsWith("reg_")
? currencyCodeOrRegionId
: undefined
const currencyCode = currencyCodeOrRegionId.startsWith("reg_")
- ? regionsCurrencyMap[regionId]
+ ? (regionId ? regionsCurrencyMap[regionId] : currencyCodeOrRegionId)
: currencyCodeOrRegionId
- let existingId = undefined
+ let existingId: string | undefined = undefined
if (regionId) {
- existingId = variants?.[ind]?.prices?.find(
- (p) => p.rules["region_id"] === regionId
+ existingId = variants[ind]?.prices?.find(
+ (p) => p.rules?.["region_id"] === regionId
)?.id
} else {
- existingId = variants?.[ind]?.prices?.find(
+ existingId = variants[ind]?.prices?.find(
(p) =>
p.currency_code === currencyCode &&
Object.keys(p.rules ?? {}).length === 0
diff --git a/src/routes/products/product-prices/product-prices.tsx b/src/routes/products/product-prices/product-prices.tsx
index b6f2fe77..474e5786 100644
--- a/src/routes/products/product-prices/product-prices.tsx
+++ b/src/routes/products/product-prices/product-prices.tsx
@@ -1,7 +1,7 @@
import { useParams } from "react-router-dom"
-import { RouteFocusModal } from "../../../components/modals"
-import { useProduct } from "../../../hooks/api/products"
+import { RouteFocusModal } from "@components/modals"
+import { useProduct } from "@hooks/api/products"
import { PricingEdit } from "./pricing-edit"
export const ProductPrices = () => {
diff --git a/src/routes/products/product-sales-channels/components/edit-sales-channels-form/edit-sales-channels-form.tsx b/src/routes/products/product-sales-channels/components/edit-sales-channels-form/edit-sales-channels-form.tsx
index 9744d043..a49b9533 100644
--- a/src/routes/products/product-sales-channels/components/edit-sales-channels-form/edit-sales-channels-form.tsx
+++ b/src/routes/products/product-sales-channels/components/edit-sales-channels-form/edit-sales-channels-form.tsx
@@ -16,9 +16,10 @@ import {
} from "../../../../../components/modals"
import { useUpdateProduct } from "../../../../../hooks/api/products"
import { useSalesChannels } from "../../../../../hooks/api/sales-channels"
+import { ExtendedAdminProduct } from "@custom-types/product"
type EditSalesChannelsFormProps = {
- product: HttpTypes.AdminProduct
+ product: ExtendedAdminProduct
}
const EditSalesChannelsSchema = zod.object({
@@ -46,6 +47,7 @@ export const EditSalesChannelsForm = ({
const initialState =
product.sales_channels?.reduce((acc, curr) => {
acc[curr.id] = true
+
return acc
}, {} as RowSelectionState) ?? {}
diff --git a/src/routes/products/product-shipping-profile/components/product-organization-form/product-shipping-profile-form.tsx b/src/routes/products/product-shipping-profile/components/product-organization-form/product-shipping-profile-form.tsx
index 8625cab6..82ebaf49 100644
--- a/src/routes/products/product-shipping-profile/components/product-organization-form/product-shipping-profile-form.tsx
+++ b/src/routes/products/product-shipping-profile/components/product-organization-form/product-shipping-profile-form.tsx
@@ -1,4 +1,3 @@
-import { HttpTypes } from "@medusajs/types"
import { Button, toast } from "@medusajs/ui"
import { useTranslation } from "react-i18next"
import * as zod from "zod"
@@ -13,11 +12,10 @@ import { sdk } from "../../../../../lib/client"
import { useForm } from "react-hook-form"
import { zodResolver } from "@hookform/resolvers/zod"
import { useEffect } from "react"
+import type { ExtendedAdminProduct } from "@custom-types/product"
type ProductShippingProfileFormProps = {
- product: HttpTypes.AdminProduct & {
- shipping_profile?: HttpTypes.AdminShippingProfile
- }
+ product: ExtendedAdminProduct
}
const ProductShippingProfileSchema = zod.object({
diff --git a/src/routes/promotions/common/constants.ts b/src/routes/promotions/common/constants.ts
new file mode 100644
index 00000000..6fed1a01
--- /dev/null
+++ b/src/routes/promotions/common/constants.ts
@@ -0,0 +1,12 @@
+import type { PromotionRuleOperatorValues } from "@medusajs/types"
+
+export const PROMOTION_RULE_OPERATORS = [
+ "gt",
+ "lt",
+ "eq",
+ "ne",
+ "in",
+ "lte",
+ "gte",
+] as const satisfies readonly PromotionRuleOperatorValues[]
+
diff --git a/src/routes/promotions/common/edit-rules/components/edit-rules-form/edit-rules-form.tsx b/src/routes/promotions/common/edit-rules/components/edit-rules-form/edit-rules-form.tsx
index 3942d870..a33a51da 100644
--- a/src/routes/promotions/common/edit-rules/components/edit-rules-form/edit-rules-form.tsx
+++ b/src/routes/promotions/common/edit-rules/components/edit-rules-form/edit-rules-form.tsx
@@ -1,20 +1,21 @@
import { zodResolver } from "@hookform/resolvers/zod"
-import { PromotionDTO, PromotionRuleDTO } from "@medusajs/types"
+import type { HttpTypes, PromotionRuleDTO } from "@medusajs/types"
import { Button } from "@medusajs/ui"
import { useState } from "react"
import { useForm } from "react-hook-form"
import { useTranslation } from "react-i18next"
-import { RouteDrawer } from "../../../../../../components/modals"
-import { KeyboundForm } from "../../../../../../components/utilities/keybound-form"
-import { RuleTypeValues } from "../../edit-rules"
+import type { RuleToRemove } from "@custom-types/promotion/common"
+import { RouteDrawer } from "@/components/modals"
+import { KeyboundForm } from "@/components/utilities/keybound-form"
+import type { RuleTypeValues } from "../../edit-rules"
import { RulesFormField } from "../rules-form-field"
-import { EditRules, EditRulesType } from "./form-schema"
+import { EditRules, type EditRulesType } from "./form-schema"
type EditPromotionFormProps = {
- promotion: PromotionDTO
+ promotion: HttpTypes.AdminPromotion
rules: PromotionRuleDTO[]
ruleType: RuleTypeValues
- handleSubmit: any
+ handleSubmit: (rulesToRemove?: RuleToRemove[]) => (data: EditRulesType) => Promise
isSubmitting: boolean
}
@@ -25,20 +26,22 @@ export const EditRulesForm = ({
isSubmitting,
}: EditPromotionFormProps) => {
const { t } = useTranslation()
- const [rulesToRemove, setRulesToRemove] = useState([])
+ const [rulesToRemove, setRulesToRemove] = useState([])
const form = useForm({
defaultValues: {
rules: [],
type: promotion.type,
application_method: {
- target_type: promotion.application_method?.target_type,
+ target_type: promotion.application_method?.target_type || "items",
},
},
resolver: zodResolver(EditRules),
})
- const handleFormSubmit = form.handleSubmit(handleSubmit(rulesToRemove))
+ const handleFormSubmit = form.handleSubmit((data) => {
+ return handleSubmit(rulesToRemove)(data)
+ })
return (
@@ -48,7 +51,7 @@ export const EditRulesForm = ({
>
- (rules || []).map((rule) => ({
- id: rule.id,
- required: rule.required,
- field_type: rule.field_type,
- disguised: rule.disguised,
- attribute: rule.attribute!,
- operator: rule.operator!,
- values:
- rule.field_type === "number" || rule.operator === "eq"
- ? typeof rule.values === "object"
- ? rule.values[0]?.value
- : rule.values
- : rule?.values?.map((v: { value: string }) => v.value!),
- }))
+
+export const generateRuleAttributes = (rules?: HttpTypes.AdminPromotionRule[]) =>
+ (rules || []).map((rule) => {
+ const extendedRule = rule as ExtendedAdminPromotionRule
+
+ const values =
+ extendedRule.field_type === "number" || extendedRule.operator === "eq"
+ ? Array.isArray(extendedRule.values) && extendedRule.values.length > 0
+ ? extendedRule.values[0]?.value
+ : typeof extendedRule.values === "string" || typeof extendedRule.values === "number"
+ ? extendedRule.values
+ : ""
+ : Array.isArray(extendedRule.values)
+ ? extendedRule.values.map((v) => v.value ?? "").filter(Boolean)
+ : []
+
+ return {
+ id: extendedRule.id,
+ required: extendedRule.required,
+ field_type: extendedRule.field_type,
+ disguised: extendedRule.disguised,
+ attribute: extendedRule.attribute ?? "",
+ operator: extendedRule.operator ?? "",
+ values: values as string | number | string[],
+ }
+ })
diff --git a/src/routes/promotions/common/edit-rules/components/edit-rules-wrapper/edit-rules-wrapper.tsx b/src/routes/promotions/common/edit-rules/components/edit-rules-wrapper/edit-rules-wrapper.tsx
index 0e2328a7..625962e7 100644
--- a/src/routes/promotions/common/edit-rules/components/edit-rules-wrapper/edit-rules-wrapper.tsx
+++ b/src/routes/promotions/common/edit-rules/components/edit-rules-wrapper/edit-rules-wrapper.tsx
@@ -1,23 +1,22 @@
-import {
+import type {
CreatePromotionRuleDTO,
- PromotionDTO,
+ HttpTypes,
PromotionRuleDTO,
- PromotionRuleOperatorValues,
- PromotionRuleResponse,
} from "@medusajs/types"
-import { useRouteModal } from "../../../../../../components/modals"
+import type { RuleToRemove } from "@custom-types/promotion/common"
+import { useRouteModal } from "@/components/modals"
import {
usePromotionAddRules,
usePromotionRemoveRules,
usePromotionUpdateRules,
useUpdatePromotion,
-} from "../../../../../../hooks/api/promotions"
-import { RuleTypeValues } from "../../edit-rules"
-import { EditRulesForm } from "../edit-rules-form"
-import { getRuleValue } from "./utils"
+} from "@/hooks/api/promotions"
+import type { RuleTypeValues } from "@/routes/promotions/common/edit-rules/edit-rules"
+import { EditRulesForm } from "@/routes/promotions/common/edit-rules/components/edit-rules-form/edit-rules-form"
+import type { EditRulesType } from "@/routes/promotions/common/edit-rules/components/edit-rules-form/form-schema"
type EditPromotionFormProps = {
- promotion: PromotionDTO
+ promotion: HttpTypes.AdminPromotion
rules: PromotionRuleDTO[]
ruleType: RuleTypeValues
}
@@ -42,11 +41,9 @@ export const EditRulesWrapper = ({
const { mutateAsync: updatePromotionRules, isPending } =
usePromotionUpdateRules(promotion.id, ruleType)
- const handleSubmit = (
- rulesToRemove?: { id: string; disguised: boolean; attribute: string }[]
- ) => {
- return async function (data: { rules: PromotionRuleResponse[] }) {
- const applicationMethodData: Record = {}
+ const handleSubmit = (rulesToRemove?: RuleToRemove[]) => {
+ return async function (data: EditRulesType) {
+ const applicationMethodData: Record = {}
const { rules: allRules = [] } = data
const disguisedRules = allRules.filter((rule) => rule.disguised)
const disguisedRulesToRemove =
@@ -56,7 +53,12 @@ export const EditRulesWrapper = ({
// database, they are currently all under application_method. If more of these are coming
// up, abstract this away.
for (const rule of disguisedRules) {
- applicationMethodData[rule.attribute] = getRuleValue(rule)
+ const value = Array.isArray(rule.values)
+ ? rule.values[0] || null
+ : rule.values || null
+
+ applicationMethodData[rule.attribute] =
+ rule.field_type === "number" && value ? Number(value) : value
}
for (const rule of disguisedRulesToRemove) {
@@ -66,46 +68,85 @@ export const EditRulesWrapper = ({
// This variable will contain the rules that are actual rule objects, without the disguised
// objects
const rulesData = allRules.filter((rule) => !rule.disguised)
- const rulesToCreate: CreatePromotionRuleDTO[] = rulesData.filter(
- (rule) => !("id" in rule)
+
+ const existingRuleIds = new Set(rules.map((r) => r.id).filter(Boolean))
+
+ const currentFormRuleIds = new Set(
+ rulesData
+ .map((r) => r.id)
+ .filter((id): id is string => typeof id === "string" && id !== "")
+ )
+
+ const explicitlyMarkedForRemoval = new Set(
+ (rulesToRemove || []).map((r) => r.id).filter(Boolean)
)
+
+ const rulesToRemoveIds = new Set([
+ ...explicitlyMarkedForRemoval,
+ ...rules
+ .map((r) => r.id)
+ .filter((id): id is string => Boolean(id) && !currentFormRuleIds.has(id)),
+ ])
+
+ // Rules to create: no ID or ID doesn't exist in current promotion
+ const rulesToCreate = rulesData.filter(
+ (rule) => !rule.id || rule.id === "" || !existingRuleIds.has(rule.id)
+ )
+
+ // Rules to update: have ID and ID exists in current promotion
const rulesToUpdate = rulesData.filter(
- (rule: { id: string }) => typeof rule.id === "string"
+ (rule): rule is EditRulesType["rules"][number] & { id: string } =>
+ typeof rule.id === "string" && rule.id !== "" && existingRuleIds.has(rule.id)
)
if (Object.keys(applicationMethodData).length) {
await updatePromotion({
application_method: applicationMethodData,
- } as any)
+ })
}
- rulesToCreate.length &&
- (await addPromotionRules({
- rules: rulesToCreate.map((rule) => {
+ if (rulesToCreate.length) {
+ await addPromotionRules({
+ rules: rulesToCreate.map((rule): CreatePromotionRuleDTO => {
+ const values: string | string[] = Array.isArray(rule.values)
+ ? rule.values.map((v) => String(v))
+ : typeof rule.values === "number"
+ ? String(rule.values)
+ : rule.values
+
return {
attribute: rule.attribute,
operator: rule.operator,
- values: rule.values,
- } as any
+ values,
+ }
}),
- }))
+ })
+ }
+
+ if (rulesToRemoveIds.size > 0) {
+ await removePromotionRules({
+ rule_ids: Array.from(rulesToRemoveIds) as string[],
+ })
+ }
- rulesToRemove?.length &&
- (await removePromotionRules({
- rule_ids: rulesToRemove.map((r) => r.id).filter(Boolean),
- }))
+ if (rulesToUpdate.length) {
+ await updatePromotionRules({
+ rules: rulesToUpdate.map((rule) => {
+ const values: string | string[] = Array.isArray(rule.values)
+ ? rule.values.map((v) => String(v))
+ : typeof rule.values === "number"
+ ? String(rule.values)
+ : rule.values
- rulesToUpdate.length &&
- (await updatePromotionRules({
- rules: rulesToUpdate.map((rule: PromotionRuleResponse) => {
return {
- id: rule.id!,
+ id: rule.id,
attribute: rule.attribute,
- operator: rule.operator as PromotionRuleOperatorValues,
- values: rule.values as unknown as string | string[],
+ operator: rule.operator,
+ values,
}
}),
- }))
+ })
+ }
handleSuccess()
}
diff --git a/src/routes/promotions/common/edit-rules/components/edit-rules-wrapper/utils.ts b/src/routes/promotions/common/edit-rules/components/edit-rules-wrapper/utils.ts
index b88d48b9..d2540ec3 100644
--- a/src/routes/promotions/common/edit-rules/components/edit-rules-wrapper/utils.ts
+++ b/src/routes/promotions/common/edit-rules/components/edit-rules-wrapper/utils.ts
@@ -1,9 +1,19 @@
-import { PromotionRuleResponse } from "@medusajs/types"
+import type { ExtendedAdminPromotionRule } from "@custom-types/promotion/common"
-export const getRuleValue = (rule: PromotionRuleResponse) => {
+export const getRuleValue = (rule: ExtendedAdminPromotionRule): string | number | null => {
if (rule.field_type === "number") {
- return parseInt(rule.values as unknown as string)
+ const value = Array.isArray(rule.values) && rule.values.length > 0
+ ? rule.values[0]?.value
+ : typeof rule.values === "string"
+ ? rule.values
+ : null
+
+ return value ? parseInt(value, 10) : null
}
- return rule.values
+ if (Array.isArray(rule.values)) {
+ return rule.values.length > 0 ? rule.values[0]?.value ?? null : null
+ }
+
+ return typeof rule.values === "string" ? rule.values : null
}
diff --git a/src/routes/promotions/common/edit-rules/components/rule-value-form-field/rule-value-form-field.tsx b/src/routes/promotions/common/edit-rules/components/rule-value-form-field/rule-value-form-field.tsx
index baf4223f..bc0a3d6e 100644
--- a/src/routes/promotions/common/edit-rules/components/rule-value-form-field/rule-value-form-field.tsx
+++ b/src/routes/promotions/common/edit-rules/components/rule-value-form-field/rule-value-form-field.tsx
@@ -177,7 +177,7 @@ export const RuleValueFormField = ({
? t("labels.selectValue")
: t("labels.selectValues")
}
- disabled={!watchOperator}
+ disabled={!fieldRule.attribute || !watchOperator}
onChange={onChange}
data-testid={`${testIdBase}-combobox`}
/>
diff --git a/src/routes/promotions/common/edit-rules/components/rules-form-field/rules-form-field.tsx b/src/routes/promotions/common/edit-rules/components/rules-form-field/rules-form-field.tsx
index 850f185b..cbcea1cd 100644
--- a/src/routes/promotions/common/edit-rules/components/rules-form-field/rules-form-field.tsx
+++ b/src/routes/promotions/common/edit-rules/components/rules-form-field/rules-form-field.tsx
@@ -1,31 +1,33 @@
import { XMarkMini } from "@medusajs/icons"
-import { PromotionDTO } from "@medusajs/types"
+import type { HttpTypes, PromotionRuleOperatorValues } from "@medusajs/types"
import { Badge, Button, Heading, IconButton, Select, Text } from "@medusajs/ui"
import { forwardRef, Fragment, useEffect, useRef } from "react"
-import {
+import type {
ControllerRenderProps,
- useFieldArray,
+ FieldValues,
UseFormReturn,
- useWatch,
} from "react-hook-form"
+import { useFieldArray, useWatch } from "react-hook-form"
import { useTranslation } from "react-i18next"
-import { Form } from "../../../../../../components/common/form"
+import type { FormRule, RuleToRemove } from "@custom-types/promotion/common"
+import { Form } from "@/components/common/form"
import {
usePromotionRuleAttributes,
usePromotionRules,
-} from "../../../../../../hooks/api/promotions"
-import { useDocumentDirection } from "../../../../../../hooks/use-document-direction"
-import { CreatePromotionSchemaType } from "../../../../promotion-create/components/create-promotion-form/form-schema"
-import { generateRuleAttributes } from "../edit-rules-form/utils"
-import { RuleValueFormField } from "../rule-value-form-field"
+} from "@/hooks/api/promotions"
+import { useDocumentDirection } from "@/hooks/use-document-direction"
+import type { CreatePromotionSchemaType } from "@/routes/promotions/promotion-create/components/create-promotion-form/form-schema"
+import type { EditRulesType } from "@/routes/promotions/common/edit-rules/components/edit-rules-form/form-schema"
+import { generateRuleAttributes } from "@/routes/promotions/common/edit-rules/components/edit-rules-form/utils"
+import { RuleValueFormField } from "@/routes/promotions/common/edit-rules/components/rule-value-form-field"
import { requiredProductRule } from "./constants"
type RulesFormFieldType = {
- promotion?: PromotionDTO
- form: UseFormReturn
+ promotion?: HttpTypes.AdminPromotion
+ form: UseFormReturn | UseFormReturn
ruleType: "rules" | "target-rules" | "buy-rules"
- setRulesToRemove?: any
- rulesToRemove?: any
+ setRulesToRemove?: (rules: RuleToRemove[]) => void
+ rulesToRemove?: RuleToRemove[]
scope?:
| "application_method.buy_rules"
| "rules"
@@ -46,46 +48,92 @@ export const RulesFormField = ({
const { t } = useTranslation()
const direction = useDocumentDirection()
+
+ // Type-safe form data access based on formType
const formData = form.getValues()
+ const formTypeValue = formType === "create"
+ ? (formData as CreatePromotionSchemaType).type
+ : (formData as EditRulesType).type
+
+ const applicationMethodTargetTypeValue = formType === "create"
+ ? (formData as CreatePromotionSchemaType).application_method?.target_type
+ : (formData as EditRulesType).application_method?.target_type
+
const { attributes } = usePromotionRuleAttributes(
ruleType,
- formData.type,
- formData.application_method?.target_type
+ formTypeValue,
+ applicationMethodTargetTypeValue
)
- const { fields, append, remove, update, replace } = useFieldArray({
- control: form.control,
- name: scope,
- keyName: scope,
- })
-
- const promotionType = useWatch({
- control: form.control,
- name: "type",
- defaultValue: promotion?.type,
- })
-
- const applicationMethodType = useWatch({
- control: form.control,
- name: "application_method.type",
- defaultValue: promotion?.application_method?.type,
- })
-
- const applicationMethodTargetType = useWatch({
- control: form.control,
- name: "application_method.target_type",
- defaultValue: promotion?.application_method?.target_type,
- })
+ // Type-safe field array - use conditional logic based on formType
+ // Helper to get the correct field name based on scope
+ const getFieldName = (): "rules" | "application_method.buy_rules" | "application_method.target_rules" => {
+ if (scope === "rules") {
+ return "rules"
+ }
+ if (scope === "application_method.buy_rules") {
+ return "application_method.buy_rules"
+ }
+
+ return "application_method.target_rules"
+ }
+
+ const fieldName = getFieldName()
+
+ const createFormFieldArray = formType === "create"
+ ? useFieldArray({
+ control: (form as UseFormReturn).control,
+ name: fieldName as "rules" | "application_method.buy_rules" | "application_method.target_rules",
+ })
+ : useFieldArray({
+ control: (form as UseFormReturn).control,
+ name: "rules" as const, // EditRulesType only supports "rules"
+ })
+
+ const { fields, append, remove, update, replace } = createFormFieldArray
+
+ // Type-safe watch - handle union type properly
+ const promotionType = formType === "create"
+ ? useWatch({
+ control: (form as UseFormReturn).control,
+ name: "type",
+ defaultValue: promotion?.type,
+ })
+ : useWatch({
+ control: (form as UseFormReturn).control,
+ name: "type",
+ defaultValue: promotion?.type,
+ })
+
+ const applicationMethodType = formType === "create"
+ ? useWatch({
+ control: (form as UseFormReturn).control,
+ name: "application_method.type",
+ defaultValue: promotion?.application_method?.type,
+ })
+ : undefined
+
+ const applicationMethodTargetType = formType === "create"
+ ? useWatch({
+ control: (form as UseFormReturn).control,
+ name: "application_method.target_type",
+ defaultValue: promotion?.application_method?.target_type,
+ })
+ : useWatch({
+ control: (form as UseFormReturn).control,
+ name: "application_method.target_type",
+ defaultValue: promotion?.application_method?.target_type,
+ })
const query: Record = promotionType
? {
promotion_type: promotionType,
- application_method_type: applicationMethodType,
- application_method_target_type: applicationMethodTargetType,
+ ...(applicationMethodType && { application_method_type: applicationMethodType }),
+ ...(applicationMethodTargetType && { application_method_target_type: applicationMethodTargetType }),
}
: {}
- const { rules, isLoading } = usePromotionRules(
+ const { rules: apiRules, isLoading } = usePromotionRules(
promotion?.id || null,
ruleType,
query,
@@ -94,6 +142,9 @@ export const RulesFormField = ({
}
)
+ // Type-safe conversion: API returns HttpTypes.AdminPromotionRule[] but we need ExtendedAdminPromotionRule[]
+ const rules = apiRules as HttpTypes.AdminPromotionRule[] | undefined
+
useEffect(() => {
if (isLoading) {
return
@@ -108,29 +159,37 @@ export const RulesFormField = ({
}
if (ruleType === "rules" && !fields.length) {
- form.resetField("rules")
-
- replace(generateRuleAttributes(rules) as any)
+ if (formType === "create") {
+ (form as UseFormReturn).resetField("rules")
+ } else {
+ (form as UseFormReturn).resetField("rules")
+ }
+ replace(generateRuleAttributes(rules) as CreatePromotionSchemaType["rules"] | EditRulesType["rules"])
}
if (ruleType === "buy-rules" && !fields.length) {
- form.resetField("application_method.buy_rules")
+ // EditRulesType doesn't have buy_rules, only CreatePromotionSchemaType does
+ if (formType === "create") {
+ (form as UseFormReturn).resetField("application_method.buy_rules")
+ }
const rulesToAppend =
promotion?.id || promotionType === "standard"
? rules
- : [...rules, requiredProductRule]
+ : [...(rules || []), requiredProductRule as HttpTypes.AdminPromotionRule]
- replace(generateRuleAttributes(rulesToAppend) as any)
+ replace(generateRuleAttributes(rulesToAppend) as CreatePromotionSchemaType["application_method"]["buy_rules"])
}
if (ruleType === "target-rules" && !fields.length) {
- form.resetField("application_method.target_rules")
+ if (formType === "create") {
+ (form as UseFormReturn).resetField("application_method.target_rules")
+ }
const rulesToAppend =
promotion?.id || promotionType === "standard"
? rules
- : [...rules, requiredProductRule]
+ : [...(rules || []), requiredProductRule as HttpTypes.AdminPromotionRule]
- replace(generateRuleAttributes(rulesToAppend) as any)
+ replace(generateRuleAttributes(rulesToAppend) as CreatePromotionSchemaType["application_method"]["target_rules"])
}
initialRulesSet.current = true
@@ -149,26 +208,35 @@ export const RulesFormField = ({
return (
- {t(
- ruleType === "target-rules"
- ? `promotions.fields.conditions.${ruleType}.${applicationMethodTargetType}.title`
- : `promotions.fields.conditions.${ruleType}.title`
- )}
+ {ruleType === "target-rules" && applicationMethodTargetType
+ ? applicationMethodTargetType === "order"
+ ? t("promotions.fields.conditions.target-rules.order.title")
+ : applicationMethodTargetType === "shipping_methods"
+ ? t("promotions.fields.conditions.target-rules.shipping_methods.title")
+ : t("promotions.fields.conditions.target-rules.items.title")
+ : ruleType === "rules"
+ ? t("promotions.fields.conditions.rules.title")
+ : t("promotions.fields.conditions.buy-rules.title")}
- {t(
- ruleType === "target-rules"
- ? `promotions.fields.conditions.${ruleType}.${applicationMethodTargetType}.description`
- : `promotions.fields.conditions.${ruleType}.description`
- )}
+ {ruleType === "target-rules" && applicationMethodTargetType
+ ? applicationMethodTargetType === "order"
+ ? t("promotions.fields.conditions.target-rules.order.description")
+ : applicationMethodTargetType === "shipping_methods"
+ ? t("promotions.fields.conditions.target-rules.shipping_methods.description")
+ : t("promotions.fields.conditions.target-rules.items.description")
+ : ruleType === "rules"
+ ? t("promotions.fields.conditions.rules.description")
+ : t("promotions.fields.conditions.buy-rules.description")}
{fields.map((fieldRule, index) => {
- const identifier = fieldRule.id
+ const typedFieldRule = fieldRule as FormRule
+ const identifier = typedFieldRule.id ?? `field-${index}`
return (
-
+
field.attribute) || []
+ fields?.map((field) => (field as FormRule).attribute).filter(Boolean) as string[] || []
+
const attributeOptions =
attributes?.filter((attr) => {
- if (attr.value === fieldRule.attribute) {
+ if (attr.value === typedFieldRule.attribute) {
return true
}
return !existingAttributes.includes(attr.value)
}) || []
- const disabled = !!fieldRule.required
+ const disabled = !!typedFieldRule.required
const onValueChange = (e: string) => {
const currentAttributeOption = attributeOptions.find(
(ao) => ao.id === e
)
- const fieldRuleOverrides: typeof fieldRule = {
- ...fieldRule,
+ const fieldRuleOverrides: FormRule = {
+ ...typedFieldRule,
disguised: currentAttributeOption?.disguised || false,
}
if (currentAttributeOption?.operators?.length === 1) {
fieldRuleOverrides.operator =
- currentAttributeOption.operators[0].value
+ currentAttributeOption.operators[0].value as PromotionRuleOperatorValues
}
if (fieldRuleOverrides.operator === "eq") {
@@ -215,7 +284,7 @@ export const RulesFormField = ({
return (
- {fieldRule.required && (
+ {typedFieldRule.required && (
- {t(
- ruleType === "target-rules"
- ? `promotions.fields.conditions.${ruleType}.${applicationMethodTargetType}.title`
- : `promotions.fields.conditions.${ruleType}.title`
- )}
+ {t(getConditionsTitleKey(ruleType, applicationMethodTargetType))}
diff --git a/src/routes/promotions/promotion-detail/components/promotion-general-section/promotion-general-section.tsx b/src/routes/promotions/promotion-detail/components/promotion-general-section/promotion-general-section.tsx
index bb2ed8d9..7fe18bd6 100644
--- a/src/routes/promotions/promotion-detail/components/promotion-general-section/promotion-general-section.tsx
+++ b/src/routes/promotions/promotion-detail/components/promotion-general-section/promotion-general-section.tsx
@@ -1,5 +1,5 @@
import { PencilSquare, Trash } from "@medusajs/icons"
-import { HttpTypes } from "@medusajs/types"
+import type { HttpTypes } from "@medusajs/types"
import {
Badge,
Container,
@@ -12,11 +12,11 @@ import {
import { useTranslation } from "react-i18next"
import { useNavigate } from "react-router-dom"
-import { ActionMenu } from "../../../../../components/common/action-menu"
-import { useDeletePromotion } from "../../../../../hooks/api/promotions"
-import { formatCurrency } from "../../../../../lib/format-currency"
-import { formatPercentage } from "../../../../../lib/percentage-helpers"
-import { getPromotionStatus } from "../../../../../lib/promotions"
+import { ActionMenu } from "@components/common/action-menu"
+import { useDeletePromotion } from "@hooks/api/promotions"
+import { formatCurrency } from "@lib/format-currency"
+import { formatPercentage } from "@lib/percentage-helpers"
+import { getPromotionStatus } from "@lib/promotions"
type PromotionGeneralSectionProps = {
promotion: HttpTypes.AdminPromotion
@@ -180,7 +180,7 @@ export const PromotionGeneralSection = ({
- {promotion.application_method?.allocation!}
+ {promotion.application_method?.allocation}
diff --git a/src/routes/promotions/promotion-detail/promotion-detail.tsx b/src/routes/promotions/promotion-detail/promotion-detail.tsx
index 46418303..f96800fe 100644
--- a/src/routes/promotions/promotion-detail/promotion-detail.tsx
+++ b/src/routes/promotions/promotion-detail/promotion-detail.tsx
@@ -48,24 +48,27 @@ export const PromotionDetail = () => {
>
-
)
diff --git a/src/routes/promotions/promotion-edit-details/components/edit-promotion-form/edit-promotion-details-form.tsx b/src/routes/promotions/promotion-edit-details/components/edit-promotion-form/edit-promotion-details-form.tsx
index 34a87200..c3afddb2 100644
--- a/src/routes/promotions/promotion-edit-details/components/edit-promotion-form/edit-promotion-details-form.tsx
+++ b/src/routes/promotions/promotion-edit-details/components/edit-promotion-form/edit-promotion-details-form.tsx
@@ -63,10 +63,11 @@ export const EditPromotionDetailsForm = ({
const { mutateAsync, isPending } = useUpdatePromotion(promotion.id)
const handleSubmit = form.handleSubmit(async (data) => {
- const value = parseFloat(data.value)
+ const value = parseFloat(String(data.value))
if (isNaN(value) || value < 0) {
form.setError("value", { message: t("promotions.form.value.invalid") })
+
return
}
@@ -77,9 +78,9 @@ export const EditPromotionDetailsForm = ({
status: data.status,
is_tax_inclusive: data.is_tax_inclusive,
application_method: {
- value: parseFloat(data.value),
- type: data.value_type as any,
- allocation: data.allocation as any,
+ value: parseFloat(String(data.value)),
+ type: data.value_type,
+ allocation: data.allocation,
},
},
{
@@ -101,6 +102,7 @@ export const EditPromotionDetailsForm = ({
}
}, [allocationWatchValue, form, promotion])
const direction = useDocumentDirection()
+
return (
{
const columns = useColumns()
const { table } = useDataTable({
- data: (promotions ?? []) as PromotionDTO[],
+ data: (promotions ?? []) as HttpTypes.AdminPromotion[],
columns,
count,
enablePagination: true,
@@ -84,7 +84,7 @@ export const PromotionListTable = () => {
)
}
-const PromotionActions = ({ promotion }: { promotion: PromotionDTO }) => {
+const PromotionActions = ({ promotion }: { promotion: HttpTypes.AdminPromotion }) => {
const { t } = useTranslation()
const prompt = usePrompt()
const navigate = useNavigate()
@@ -140,7 +140,7 @@ const PromotionActions = ({ promotion }: { promotion: PromotionDTO }) => {
)
}
-const columnHelper = createColumnHelper()
+const columnHelper = createColumnHelper()
const useColumns = () => {
const base = usePromotionTableColumns()
diff --git a/src/routes/refund-reasons/refund-reason-list/refund-reason-list.tsx b/src/routes/refund-reasons/refund-reason-list/refund-reason-list.tsx
index bec203bb..65c1247a 100644
--- a/src/routes/refund-reasons/refund-reason-list/refund-reason-list.tsx
+++ b/src/routes/refund-reasons/refund-reason-list/refund-reason-list.tsx
@@ -1,21 +1,8 @@
-import { SingleColumnPage } from "../../../components/layout/pages"
-import { useExtension } from "../../../providers/extension-provider"
import { RefundReasonListTable } from "./components/refund-reason-list-table"
export const RefundReasonList = () => {
- const { getWidgets } = useExtension()
return (
-
)
-}
+}
\ No newline at end of file
diff --git a/src/routes/sales-channels/sales-channel-add-products/components/add-products-to-sales-channel-form.tsx b/src/routes/sales-channels/sales-channel-add-products/components/add-products-to-sales-channel-form.tsx
index 10ff5828..914f77ea 100644
--- a/src/routes/sales-channels/sales-channel-add-products/components/add-products-to-sales-channel-form.tsx
+++ b/src/routes/sales-channels/sales-channel-add-products/components/add-products-to-sales-channel-form.tsx
@@ -1,5 +1,5 @@
import { zodResolver } from "@hookform/resolvers/zod"
-import { HttpTypes, SalesChannelDTO } from "@medusajs/types"
+import { SalesChannelDTO } from "@medusajs/types"
import { Button, Checkbox, Hint, Tooltip, toast } from "@medusajs/ui"
import { keepPreviousData } from "@tanstack/react-query"
import {
@@ -20,6 +20,7 @@ import { useProductTableColumns } from "../../../../hooks/table/columns/use-prod
import { useProductTableFilters } from "../../../../hooks/table/filters/use-product-table-filters"
import { useProductTableQuery } from "../../../../hooks/table/query/use-product-table-query"
import { useDataTable } from "../../../../hooks/use-data-table"
+import { ExtendedAdminProduct } from "@custom-types/product"
type AddProductsToSalesChannelFormProps = {
salesChannel: SalesChannelDTO
@@ -174,7 +175,7 @@ export const AddProductsToSalesChannelForm = ({
)
}
-const columnHelper = createColumnHelper()
+const columnHelper = createColumnHelper()
const useColumns = () => {
const base = useProductTableColumns()
diff --git a/src/routes/sales-channels/sales-channel-detail/components/sales-channel-product-section/sales-channel-product-section.tsx b/src/routes/sales-channels/sales-channel-detail/components/sales-channel-product-section/sales-channel-product-section.tsx
index f6cbd6f5..94af2903 100644
--- a/src/routes/sales-channels/sales-channel-detail/components/sales-channel-product-section/sales-channel-product-section.tsx
+++ b/src/routes/sales-channels/sales-channel-detail/components/sales-channel-product-section/sales-channel-product-section.tsx
@@ -12,7 +12,7 @@ import { useMemo, useState } from "react"
import { useTranslation } from "react-i18next"
import { Link } from "react-router-dom"
-import { HttpTypes, SalesChannelDTO } from "@medusajs/types"
+import { SalesChannelDTO } from "@medusajs/types"
import { keepPreviousData } from "@tanstack/react-query"
import { ActionMenu } from "../../../../../components/common/action-menu"
import { _DataTable } from "../../../../../components/table/data-table"
@@ -22,6 +22,7 @@ import { useProductTableColumns } from "../../../../../hooks/table/columns/use-p
import { useProductTableFilters } from "../../../../../hooks/table/filters/use-product-table-filters"
import { useProductTableQuery } from "../../../../../hooks/table/query/use-product-table-query"
import { useDataTable } from "../../../../../hooks/use-data-table"
+import { ExtendedAdminProduct } from "@custom-types/product"
const PAGE_SIZE = 10
@@ -151,7 +152,7 @@ export const SalesChannelProductSection = ({
)
}
-const columnHelper = createColumnHelper()
+const columnHelper = createColumnHelper()
const useColumns = () => {
const base = useProductTableColumns()
diff --git a/src/routes/sellers/common/components/seller-products-section.tsx b/src/routes/sellers/common/components/seller-products-section.tsx
index b1e4a607..10171a01 100644
--- a/src/routes/sellers/common/components/seller-products-section.tsx
+++ b/src/routes/sellers/common/components/seller-products-section.tsx
@@ -8,8 +8,7 @@ import { createColumnHelper } from "@tanstack/react-table";
import { useTranslation } from "react-i18next";
import { useNavigate } from "react-router-dom";
-import type { AdminProductListResponse } from "@custom-types/product";
-import type { AdminProduct } from "@custom-types/product/common";
+import type { ExtendedAdminProductListResponse, ExtendedAdminProduct } from "@custom-types/product/common";
import { ActionsButton } from "@components/common/actions-button";
import { ProductStatusBadge } from "@components/common/product-status-badge";
@@ -27,7 +26,7 @@ export const SellerProductsSection = ({
seller_products,
refetch,
}: {
- seller_products: AdminProductListResponse;
+ seller_products: ExtendedAdminProductListResponse;
refetch: () => void;
}) => {
const { products, count } = seller_products;
@@ -79,14 +78,14 @@ export const SellerProductsSection = ({
);
};
-const columnHelper = createColumnHelper();
+const columnHelper = createColumnHelper();
const useColumns = (refetch: () => void) => {
const { t } = useTranslation();
const navigate = useNavigate();
const prompt = usePrompt();
- const handleDelete = async (product: AdminProduct) => {
+ const handleDelete = async (product: ExtendedAdminProduct) => {
const res = await prompt({
title: t("general.areYouSure"),
description: t("products.deleteWarning", {
diff --git a/src/routes/sellers/seller-details/components/seller-details.tsx b/src/routes/sellers/seller-details/components/seller-details.tsx
index e81e7185..88a17602 100644
--- a/src/routes/sellers/seller-details/components/seller-details.tsx
+++ b/src/routes/sellers/seller-details/components/seller-details.tsx
@@ -1,5 +1,3 @@
-import type { AdminProductListResponse } from "@medusajs/types";
-
import { useParams } from "react-router-dom";
import type { AdminCustomerGroupListResponse } from "@custom-types/customer-group";
@@ -86,13 +84,13 @@ export const SellerDetails = () => {
if (isLoading || ordersLoading || productsLoading || customerGroupsLoading) {
return ()
+const pColumnHelper = createColumnHelper()
const useProductColumns = () => {
const base = useProductTableColumns()
@@ -971,4 +972,4 @@ const useCleanupSearchParams = (prefix?: string) => {
})
}
}, [prefix])
-}
+}
\ No newline at end of file
diff --git a/src/routes/tax-regions/common/components/target-item/target-item.tsx b/src/routes/tax-regions/common/components/target-item/target-item.tsx
index 4f200288..be88cf55 100644
--- a/src/routes/tax-regions/common/components/target-item/target-item.tsx
+++ b/src/routes/tax-regions/common/components/target-item/target-item.tsx
@@ -1,6 +1,6 @@
import { XMarkMini } from "@medusajs/icons"
import { IconButton, Text } from "@medusajs/ui"
-import { useProduct } from "../../../../../hooks/api"
+import { useProduct } from "@hooks/api"
type TargetItemProps = {
index: number
diff --git a/src/routes/tax-regions/tax-region-detail/components/index.ts b/src/routes/tax-regions/tax-region-detail/components/index.ts
deleted file mode 100644
index 63c5d159..00000000
--- a/src/routes/tax-regions/tax-region-detail/components/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from "./tax-region-general-detail"
-export * from "./tax-region-province-section"
diff --git a/src/routes/tax-regions/tax-region-detail/tax-region-detail.tsx b/src/routes/tax-regions/tax-region-detail/tax-region-detail.tsx
index b7827575..305d9f6f 100644
--- a/src/routes/tax-regions/tax-region-detail/tax-region-detail.tsx
+++ b/src/routes/tax-regions/tax-region-detail/tax-region-detail.tsx
@@ -4,7 +4,6 @@ import { useState } from "react"
import { SingleColumnPage } from "../../../components/layout/pages"
import { useTaxRegion } from "../../../hooks/api/tax-regions"
import { TaxRegionDetailSection } from "./components/tax-region-detail-section"
-import { TaxRegionProvinceSection } from "./components/tax-region-province-section"
import { SingleColumnPageSkeleton } from "../../../components/common/skeleton"
import { useExtension } from "../../../providers/extension-provider"
@@ -12,6 +11,7 @@ import { TaxRegionOverrideSection } from "./components/tax-region-override-secti
import { TaxRegionSublevelAlert } from "./components/tax-region-sublevel-alert"
import { TaxRegionProviderSection } from "./tax-region-provider-section"
import { taxRegionLoader } from "./loader"
+import { TaxRegionProvinceSection } from "./components/tax-region-province-section"
export const TaxRegionDetail = () => {
const { id } = useParams()
diff --git a/src/routes/tax-regions/tax-region-province-detail/components/index.ts b/src/routes/tax-regions/tax-region-province-detail/components/index.ts
deleted file mode 100644
index 63c5d159..00000000
--- a/src/routes/tax-regions/tax-region-province-detail/components/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from "./tax-region-general-detail"
-export * from "./tax-region-province-section"
diff --git a/src/types/claims/common.ts b/src/types/claims/common.ts
new file mode 100644
index 00000000..997e49c4
--- /dev/null
+++ b/src/types/claims/common.ts
@@ -0,0 +1,10 @@
+export interface AdminAddClaimOutboundItemsPayload {
+ items: {
+ variant_id: string;
+ quantity: number;
+ reason?: string;
+ description?: string;
+ internal_note?: string;
+ }[];
+}
+
diff --git a/src/types/claims/index.ts b/src/types/claims/index.ts
new file mode 100644
index 00000000..b7228d47
--- /dev/null
+++ b/src/types/claims/index.ts
@@ -0,0 +1,2 @@
+export * from "./common"
+
diff --git a/src/types/exchanges/common.ts b/src/types/exchanges/common.ts
new file mode 100644
index 00000000..8163b25d
--- /dev/null
+++ b/src/types/exchanges/common.ts
@@ -0,0 +1,35 @@
+import type { HttpTypes, PaginatedResponse } from "@medusajs/types";
+import type { BaseExchangeItem } from "@medusajs/types/dist/http/exchange/common";
+
+export interface ExtendedAdminExchangeItem extends BaseExchangeItem {
+ note?: string | null;
+ deleted_at?: string | null;
+ raw_quantity?: {
+ value: string;
+ precision: number;
+ };
+ item?: {
+ id: string;
+ };
+}
+export interface ExtendedAdminExchange
+ extends Omit {
+ additional_items: ExtendedAdminExchangeItem[];
+}
+
+export interface ExtendedAdminExchangeResponse {
+ exchange: ExtendedAdminExchange;
+}
+
+export type ExtendedAdminExchangeListResponse = PaginatedResponse<{
+ exchanges: ExtendedAdminExchange[];
+}>;
+export interface AdminAddExchangeOutboundItemsPayload {
+ items: {
+ variant_id: string;
+ quantity: number;
+ reason?: string;
+ description?: string;
+ internal_note?: string;
+ }[];
+}
\ No newline at end of file
diff --git a/src/types/exchanges/index.ts b/src/types/exchanges/index.ts
new file mode 100644
index 00000000..38bd338d
--- /dev/null
+++ b/src/types/exchanges/index.ts
@@ -0,0 +1 @@
+export * from './common'
\ No newline at end of file
diff --git a/src/types/product/common.ts b/src/types/product/common.ts
index c929ec23..fd1bf416 100644
--- a/src/types/product/common.ts
+++ b/src/types/product/common.ts
@@ -2,24 +2,79 @@ import type { HttpTypes, PaginatedResponse } from "@medusajs/types";
import type { AttributeDTO } from "@custom-types/attribute";
-export interface AdminProduct extends HttpTypes.AdminProduct {
+export type ExtendedAdminProductListResponse = PaginatedResponse<{
+ products: ExtendedAdminProduct[];
+}>;
+
+export interface ExtendedAdminProductResponse {
+ product: ExtendedAdminProduct;
+}
+
+export interface ExtendedAdminProduct extends Omit {
attribute_values?: AttributeDTO[];
+ images: ExtendedAdminProductImage[];
+ shipping_profile?: HttpTypes.AdminShippingProfile | null;
+ variants: ExtendedAdminProductVariant[];
+}
+
+export interface ExtendedAdminProductImage extends HttpTypes.AdminProductImage {
+ url: string
}
-export interface AdminProductResponse {
- product: AdminProduct;
+export interface ExtendedAdminProductVariantInventoryLevel extends HttpTypes.AdminInventoryLevel {
+ available_quantity: number;
+ stocked_quantity: number;
+ reserved_quantity: number;
+ incoming_quantity: number;
}
-export interface AdminProductUpdate extends HttpTypes.AdminUpdateProduct {
+export interface ExtendedAdminProductVariantInventoryItem extends HttpTypes.AdminInventoryItem {
+ location_levels?: ExtendedAdminProductVariantInventoryLevel[];
+ reserved_quantity?: number | null;
+ stocked_quantity?: number | null;
+}
+
+export interface ExtendedAdminProductVariantInventoryItemLink {
+ variant_id: string;
+ inventory_item_id: string;
+ id: string;
+ required_quantity: number;
+ created_at: string;
+ updated_at: string;
+ deleted_at: string | null;
+ inventory: ExtendedAdminProductVariantInventoryItem;
+}
+
+export interface ExtendedAdminProductUpdate extends HttpTypes.AdminUpdateProduct {
additional_data?: {
values?: Record[];
};
}
-export type AdminProductListResponse = PaginatedResponse<{
- products: AdminProduct[];
-}>;
+export interface ExtendedAdminPrice extends HttpTypes.AdminPrice {
+ rules?: Record;
+}
export interface ExtendedAdminProductListParams extends HttpTypes.AdminProductListParams {
tag_id?: string | string[]
+}
+
+// --- Product variants ---
+
+export interface ExtendedAdminProductVariantListResponse extends Omit {
+ variants: ExtendedAdminProductVariant[];
+}
+
+export interface ExtendedAdminProductVariantResponse {
+ variant: ExtendedAdminProductVariant;
+}
+
+export interface ExtendedAdminProductVariant extends Omit {
+ prices: ExtendedAdminPrice[];
+ inventory_items?: ExtendedAdminProductVariantInventoryItemLink[];
+ inventory?: ExtendedAdminProductVariantInventoryItem[];
+}
+
+export interface ExtendedAdminProductVariantInventoryItemWithQuantity extends ExtendedAdminProductVariantInventoryItem {
+ required_quantity: number;
}
\ No newline at end of file
diff --git a/src/types/promotion/common.ts b/src/types/promotion/common.ts
new file mode 100644
index 00000000..ea48ff7c
--- /dev/null
+++ b/src/types/promotion/common.ts
@@ -0,0 +1,45 @@
+import type { CampaignBudgetTypeValues, HttpTypes, PromotionRuleOperatorValues } from "@medusajs/types"
+
+export interface ExtendedAdminPromotionRule extends Omit {
+ field_type?: string
+ required?: boolean
+ disguised?: boolean
+ attribute_label?: string
+ operator_label?: string
+ values: ExtendedAdminPromotionRuleValue[]
+}
+
+export interface ExtendedAdminPromotionRuleValue {
+ id: string
+ value?: string
+ label?: string
+}
+
+export type ExtendedCampaignBudgetType = CampaignBudgetTypeValues | "use_by_attribute"
+
+export interface ExtendedCampaignBudget {
+ type?: ExtendedCampaignBudgetType
+ limit?: number | null
+ used?: number
+ currency_code?: string | null
+ attribute?: string | null
+}
+
+export type FormattedPromotionRuleTypes = "rules" | "target-rules" | "buy-rules"
+
+export interface FormRule {
+ id?: string
+ attribute: string
+ operator: PromotionRuleOperatorValues
+ values: string | number | string[]
+ required?: boolean
+ disguised?: boolean
+ field_type?: string
+}
+
+export interface RuleToRemove {
+ id: string
+ disguised?: boolean
+ attribute: string
+}
+
diff --git a/src/types/promotion/index.ts b/src/types/promotion/index.ts
new file mode 100644
index 00000000..b7228d47
--- /dev/null
+++ b/src/types/promotion/index.ts
@@ -0,0 +1,2 @@
+export * from "./common"
+
diff --git a/src/utils/error-helper.ts b/src/utils/error-helper.ts
new file mode 100644
index 00000000..1a0605b0
--- /dev/null
+++ b/src/utils/error-helper.ts
@@ -0,0 +1,13 @@
+export const getErrorMessage = (error: unknown): string => {
+ if (error instanceof Error) {
+ return error.message
+ }
+ if (typeof error === 'string') {
+ return error
+ }
+ if (error && typeof error === 'object' && 'message' in error) {
+ return String(error.message)
+ }
+
+ return "An error occurred"
+ }
\ No newline at end of file
diff --git a/yarn.lock b/yarn.lock
index 2f98bb67..39bb9d9f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -68,13 +68,13 @@
json5 "^2.2.3"
semver "^6.3.1"
-"@babel/generator@^7.25.6", "@babel/generator@^7.26.5", "@babel/generator@^7.28.3":
- version "7.28.3"
- resolved "https://registry.npmjs.org/@babel/generator/-/generator-7.28.3.tgz"
- integrity sha512-3lSpxGgvnmZznmBkCRnVREPUFJv2wrv9iAoFDvADJc0ypmdOxdUtcLeBgBJ6zE0PMeTKnxeQzyk0xTBq4Ep7zw==
+"@babel/generator@^7.25.6", "@babel/generator@^7.26.2", "@babel/generator@^7.26.5", "@babel/generator@^7.28.3", "@babel/generator@^7.28.5":
+ version "7.28.5"
+ resolved "https://registry.npmjs.org/@babel/generator/-/generator-7.28.5.tgz"
+ integrity sha512-3EwLFhZ38J4VyIP6WNtt2kUdW9dokXA9Cr4IVIFHuCpZ3H8/YFOl5JjZHisrn1fATPBmKKqXzDFvh9fUwHz6CQ==
dependencies:
- "@babel/parser" "^7.28.3"
- "@babel/types" "^7.28.2"
+ "@babel/parser" "^7.28.5"
+ "@babel/types" "^7.28.5"
"@jridgewell/gen-mapping" "^0.3.12"
"@jridgewell/trace-mapping" "^0.3.28"
jsesc "^3.0.2"
@@ -122,10 +122,10 @@
resolved "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz"
integrity sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==
-"@babel/helper-validator-identifier@^7.24.7", "@babel/helper-validator-identifier@^7.27.1":
- version "7.27.1"
- resolved "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.27.1.tgz"
- integrity sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow==
+"@babel/helper-validator-identifier@^7.24.7", "@babel/helper-validator-identifier@^7.27.1", "@babel/helper-validator-identifier@^7.28.5":
+ version "7.28.5"
+ resolved "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.28.5.tgz"
+ integrity sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==
"@babel/helper-validator-option@^7.27.1":
version "7.27.1"
@@ -147,21 +147,21 @@
dependencies:
"@babel/types" "^7.25.6"
-"@babel/parser@^7.26.7", "@babel/parser@^7.28.4":
- version "7.28.4"
- resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.28.4.tgz"
- integrity sha512-yZbBqeM6TkpP9du/I2pUZnJsRMGGvOuIrhjzC1AwHwW+6he4mni6Bp/m8ijn0iOuZuPI2BfkCoSRunpyjnrQKg==
+"@babel/parser@^7.26.2", "@babel/parser@^7.28.5":
+ version "7.28.5"
+ resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.28.5.tgz"
+ integrity sha512-KKBU1VGYR7ORr3At5HAtUQ+TV3SzRCXmA/8OdDZiLDBIZxVyzXuztPjfLd3BV1PRAQGCMWWSHYhL0F8d5uHBDQ==
dependencies:
- "@babel/types" "^7.28.4"
+ "@babel/types" "^7.28.5"
-"@babel/parser@^7.27.2":
+"@babel/parser@^7.26.7", "@babel/parser@^7.28.4":
version "7.28.4"
resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.28.4.tgz"
integrity sha512-yZbBqeM6TkpP9du/I2pUZnJsRMGGvOuIrhjzC1AwHwW+6he4mni6Bp/m8ijn0iOuZuPI2BfkCoSRunpyjnrQKg==
dependencies:
"@babel/types" "^7.28.4"
-"@babel/parser@^7.28.3":
+"@babel/parser@^7.27.2":
version "7.28.4"
resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.28.4.tgz"
integrity sha512-yZbBqeM6TkpP9du/I2pUZnJsRMGGvOuIrhjzC1AwHwW+6he4mni6Bp/m8ijn0iOuZuPI2BfkCoSRunpyjnrQKg==
@@ -196,6 +196,19 @@
"@babel/parser" "^7.27.2"
"@babel/types" "^7.27.1"
+"@babel/traverse@^7.25.9":
+ version "7.28.5"
+ resolved "https://registry.npmjs.org/@babel/traverse/-/traverse-7.28.5.tgz"
+ integrity sha512-TCCj4t55U90khlYkVV/0TfkJkAkUg3jZFA3Neb7unZT8CPok7iiRfaX0F+WnqWqt7OxhOn0uBKXCw4lbL8W0aQ==
+ dependencies:
+ "@babel/code-frame" "^7.27.1"
+ "@babel/generator" "^7.28.5"
+ "@babel/helper-globals" "^7.28.0"
+ "@babel/parser" "^7.28.5"
+ "@babel/template" "^7.27.2"
+ "@babel/types" "^7.28.5"
+ debug "^4.3.1"
+
"@babel/traverse@^7.26.7":
version "7.28.4"
resolved "https://registry.npmjs.org/@babel/traverse/-/traverse-7.28.4.tgz"
@@ -270,7 +283,23 @@
"@babel/helper-validator-identifier" "^7.24.7"
to-fast-properties "^2.0.0"
-"@babel/types@^7.26.7", "@babel/types@^7.27.1", "@babel/types@^7.28.2", "@babel/types@^7.28.4":
+"@babel/types@^7.26.0", "@babel/types@^7.28.5":
+ version "7.28.5"
+ resolved "https://registry.npmjs.org/@babel/types/-/types-7.28.5.tgz"
+ integrity sha512-qQ5m48eI/MFLQ5PxQj4PFaprjyCTLI37ElWMmNs0K8Lk3dVeOdNpB3ks8jc7yM5CDmVC73eMVk/trk3fgmrUpA==
+ dependencies:
+ "@babel/helper-string-parser" "^7.27.1"
+ "@babel/helper-validator-identifier" "^7.28.5"
+
+"@babel/types@^7.26.7", "@babel/types@^7.27.1", "@babel/types@^7.28.4":
+ version "7.28.4"
+ resolved "https://registry.npmjs.org/@babel/types/-/types-7.28.4.tgz"
+ integrity sha512-bkFqkLhh3pMBUQQkpVgWDWq/lqzc2678eUyDlTBhRqhCHFguYYGM0Efga7tYk4TogG/3x0EEl66/OQ+WGbWB/Q==
+ dependencies:
+ "@babel/helper-string-parser" "^7.27.1"
+ "@babel/helper-validator-identifier" "^7.27.1"
+
+"@babel/types@^7.28.2":
version "7.28.4"
resolved "https://registry.npmjs.org/@babel/types/-/types-7.28.4.tgz"
integrity sha512-bkFqkLhh3pMBUQQkpVgWDWq/lqzc2678eUyDlTBhRqhCHFguYYGM0Efga7tYk4TogG/3x0EEl66/OQ+WGbWB/Q==
@@ -456,6 +485,17 @@
resolved "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz"
integrity sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==
+"@ianvs/prettier-plugin-sort-imports@*", "@ianvs/prettier-plugin-sort-imports@^4.7.0":
+ version "4.7.0"
+ resolved "https://registry.npmjs.org/@ianvs/prettier-plugin-sort-imports/-/prettier-plugin-sort-imports-4.7.0.tgz"
+ integrity sha512-soa2bPUJAFruLL4z/CnMfSEKGznm5ebz29fIa9PxYtu8HHyLKNE1NXAs6dylfw1jn/ilEIfO2oLLN6uAafb7DA==
+ dependencies:
+ "@babel/generator" "^7.26.2"
+ "@babel/parser" "^7.26.2"
+ "@babel/traverse" "^7.25.9"
+ "@babel/types" "^7.26.0"
+ semver "^7.5.2"
+
"@internationalized/date@^3.10.0":
version "3.10.0"
resolved "https://registry.npmjs.org/@internationalized/date/-/date-3.10.0.tgz"
@@ -556,11 +596,6 @@
resolved "https://registry.npmjs.org/@medusajs/icons/-/icons-2.10.3.tgz"
integrity sha512-w1NQzNY/cTsfjuEQ8AOpEI49mxA6Oa6tJlg4HMfpOjDl3/R2qZtQXa8DIchSr3Sx+/RTsIGYUxv4Vbd+VTszJg==
-"@medusajs/icons@2.11.1":
- version "2.11.1"
- resolved "https://registry.npmjs.org/@medusajs/icons/-/icons-2.11.1.tgz"
- integrity sha512-XCjCIYy2ZbGQx72pk3ETFT8rSrTt1m+tuGKwIk0mSoW5uhZvnB+wZES4+s4Hcw+GeE2anIgEGe9TLk2ftk9sYA==
-
"@medusajs/js-sdk@2.10.3":
version "2.10.3"
resolved "https://registry.npmjs.org/@medusajs/js-sdk/-/js-sdk-2.10.3.tgz"
@@ -2708,7 +2743,7 @@
resolved "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.20.tgz"
integrity sha512-H3MHACvFUEiujabxhaI/ImO6gUrd8oOurg7LQtS7mbwIXA/cUqWrvBsaeJ23aZEPk1TAYkurjfMbSELfoCXlGA==
-"@types/node@^18.0.0 || ^20.0.0 || >=22.0.0", "@types/node@^18.0.0 || >=20.0.0", "@types/node@^20.11.15":
+"@types/node@^18.0.0 || ^20.0.0 || >=22.0.0", "@types/node@^18.0.0 || >=20.0.0", "@types/node@^20.11.15", "@types/node@>=16":
version "20.19.21"
resolved "https://registry.npmjs.org/@types/node/-/node-20.19.21.tgz"
integrity sha512-CsGG2P3I5y48RPMfprQGfy4JPRZ6csfC3ltBZSRItG3ngggmNY/qs2uZKp4p9VbrpqNNSMzUZNFZKzgOGnd/VA==
@@ -2738,6 +2773,13 @@
"@types/prop-types" "*"
csstype "^3.0.2"
+"@types/stripe@^8.0.416":
+ version "8.0.416"
+ resolved "https://registry.npmjs.org/@types/stripe/-/stripe-8.0.416.tgz"
+ integrity sha512-LDA574j7g30dg4R+SI1JIpkS+rkIuXgbe6+/qlf62avd7ZNntbbl2DYZwAIj9CfJYVh7FG/PLeoNB5OXTsEehg==
+ dependencies:
+ stripe "*"
+
"@typescript-eslint/eslint-plugin@^8.46.1":
version "8.46.1"
resolved "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.46.1.tgz"
@@ -5372,7 +5414,7 @@ prettier-plugin-tailwindcss@^0.7.0:
resolved "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.7.0.tgz"
integrity sha512-zpRZhkfwq1cNmbKhmKzXKuKFdkgXZXlf6p+KttD75v6pGz1FxmcKMc4RKdw97GYBKBbout4113HSLaBJAomFDw==
-prettier@^3, prettier@^3.0, prettier@^3.1.1, prettier@>=3.0.0, "prettier@2.x - 3.x":
+prettier@^3, prettier@^3.0, prettier@^3.1.1, prettier@>=3.0.0, "prettier@2 || 3 || ^4.0.0-0", "prettier@2.x - 3.x":
version "3.6.2"
resolved "https://registry.npmjs.org/prettier/-/prettier-3.6.2.tgz"
integrity sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ==
@@ -5404,7 +5446,7 @@ punycode@^2.1.0:
resolved "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz"
integrity sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==
-qs@^6.12.0, qs@^6.12.1:
+qs@^6.11.0, qs@^6.12.0, qs@^6.12.1:
version "6.14.0"
resolved "https://registry.npmjs.org/qs/-/qs-6.14.0.tgz"
integrity sha512-YWWTjgABSKcvs/nWBi9PycY/JiPJqOD4JA6o9Sej2AtvSGarXxKC3OQSk4pAarbdQlKAh5D4FCQkJNkW+GAn3w==
@@ -5852,7 +5894,7 @@ semver@^6.3.1:
resolved "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz"
integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
-semver@^7.6.0:
+semver@^7.5.2, semver@^7.6.0:
version "7.7.3"
resolved "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz"
integrity sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==
@@ -6132,6 +6174,13 @@ strip-literal@^3.0.0:
dependencies:
js-tokens "^9.0.1"
+stripe@*:
+ version "20.0.0"
+ resolved "https://registry.npmjs.org/stripe/-/stripe-20.0.0.tgz"
+ integrity sha512-EaZeWpbJOCcDytdjKSwdrL5BxzbDGNueiCfHjHXlPdBQvLqoxl6AAivC35SPzTmVXJb5duXQlXFGS45H0+e6Gg==
+ dependencies:
+ qs "^6.11.0"
+
sucrase@^3.35.0:
version "3.35.0"
resolved "https://registry.npmjs.org/sucrase/-/sucrase-3.35.0.tgz"
@@ -79,7 +80,7 @@ const useVariantPriceGridColumns = ({
disableHiding: true,
}),
...createDataGridPriceColumns<
- HttpTypes.AdminProductVariant,
+ z.infer,
z.infer
>({
currencies: currencies.map((c) => c.currency_code),
@@ -89,6 +90,7 @@ const useVariantPriceGridColumns = ({
if (context.column.id?.startsWith("currency_prices")) {
return `prices.${value}`
}
+
return `prices.${value}`
},
t,
diff --git a/src/routes/products/product-create-variant/product-create-variant.tsx b/src/routes/products/product-create-variant/product-create-variant.tsx
index d37b6106..3b8a3369 100644
--- a/src/routes/products/product-create-variant/product-create-variant.tsx
+++ b/src/routes/products/product-create-variant/product-create-variant.tsx
@@ -1,6 +1,6 @@
import { useParams } from "react-router-dom"
-import { RouteFocusModal } from "../../../components/modals"
-import { useProduct } from "../../../hooks/api/products"
+import { RouteFocusModal } from "@components/modals"
+import { useProduct } from "@hooks/api/products"
import { CreateProductVariantForm } from "./components/create-product-variant-form"
export const ProductCreateVariant = () => {
diff --git a/src/routes/products/product-create/components/product-create-form/product-create-form.tsx b/src/routes/products/product-create/components/product-create-form/product-create-form.tsx
index 60497838..91aa0ac5 100644
--- a/src/routes/products/product-create/components/product-create-form/product-create-form.tsx
+++ b/src/routes/products/product-create/components/product-create-form/product-create-form.tsx
@@ -81,6 +81,7 @@ export const ProductCreateForm = ({
return regions.reduce(
(acc, reg) => {
acc[reg.id] = reg.currency_code
+
return acc
},
{} as Record
@@ -148,7 +149,7 @@ export const ProductCreateForm = ({
normalizeProductFormValues({
...payload,
media: uploadedMedia,
- status: (isDraftSubmission ? "draft" : "published") as any,
+ status: (isDraftSubmission ? "draft" : "published"),
regionsCurrencyMap,
}),
{
@@ -210,7 +211,6 @@ export const ProductCreateForm = ({
}
setTabState({ ...currentState })
- // eslint-disable-next-line react-hooks/exhaustive-deps -- we only want this effect to run when the tab changes
}, [tab])
return (
diff --git a/src/routes/products/product-create/components/product-create-variants-form/product-create-variants-form.tsx b/src/routes/products/product-create/components/product-create-variants-form/product-create-variants-form.tsx
index 9b4661a2..83a98bdc 100644
--- a/src/routes/products/product-create/components/product-create-variants-form/product-create-variants-form.tsx
+++ b/src/routes/products/product-create/components/product-create-variants-form/product-create-variants-form.tsx
@@ -22,6 +22,8 @@ type ProductCreateVariantsFormProps = {
pricePreferences: HttpTypes.AdminPricePreference[]
}
+type VariantWithIndex = ProductCreateVariantSchema & { originalIndex: number }
+
export const ProductCreateVariantsForm = ({
form,
regions,
@@ -57,8 +59,9 @@ export const ProductCreateVariantsForm = ({
pricePreferences,
})
+
const variantData = useMemo(() => {
- const ret = []
+ const ret: VariantWithIndex[] = []
variants.forEach((v, i) => {
if (v.should_create) {
@@ -82,7 +85,7 @@ export const ProductCreateVariantsForm = ({
}
const columnHelper = createDataGridHelper<
- ProductCreateVariantSchema,
+ VariantWithIndex,
ProductCreateSchemaType
>()
@@ -184,7 +187,7 @@ const useColumns = ({
}),
...createDataGridPriceColumns<
- ProductCreateVariantSchema,
+ VariantWithIndex,
ProductCreateSchemaType
>({
currencies,
@@ -194,6 +197,7 @@ const useColumns = ({
if (context.column.id?.startsWith("currency_prices")) {
return `variants.${context.row.original.originalIndex}.prices.${value}`
}
+
return `variants.${context.row.original.originalIndex}.prices.${value}`
},
t,
diff --git a/src/routes/products/product-create/utils.ts b/src/routes/products/product-create/utils.ts
index 31c74fd9..2f1ac747 100644
--- a/src/routes/products/product-create/utils.ts
+++ b/src/routes/products/product-create/utils.ts
@@ -49,6 +49,57 @@ export const normalizeProductFormValues = (
}
}
+type InventoryItem = {
+ inventory_item_id: string
+ required_quantity: number
+}
+
+type PriceItem = {
+ currency_code: string
+ amount: number
+ rules?: { region_id: string }
+}
+
+const normalizeInventoryItem = (
+ item: { inventory_item_id: string; required_quantity?: number | string | null }
+): InventoryItem | null => {
+ const quantity = item.required_quantity
+ ? castNumber(item.required_quantity)
+ : null
+
+ if (!item.inventory_item_id || !quantity) {
+ return null
+ }
+
+ return {
+ ...item,
+ required_quantity: quantity,
+ }
+}
+
+const normalizePriceItem = (
+ key: string,
+ value: number | string | undefined,
+ regionsCurrencyMap: Record
+): PriceItem | null => {
+ if (value === "" || value === undefined) {
+ return null
+ }
+
+ if (key.startsWith("reg_")) {
+ return {
+ currency_code: regionsCurrencyMap[key],
+ amount: castNumber(value),
+ rules: { region_id: key },
+ }
+ }
+
+ return {
+ currency_code: key,
+ amount: castNumber(value),
+ }
+}
+
export const normalizeVariants = (
variants: ProductCreateSchemaType["variants"],
regionsCurrencyMap: Record
@@ -60,47 +111,12 @@ export const normalizeVariants = (
manage_inventory: !!variant.manage_inventory,
allow_backorder: !!variant.allow_backorder,
variant_rank: variant.variant_rank,
- inventory_items: variant
- .inventory!.map((i) => {
- const quantity = i.required_quantity
- ? castNumber(i.required_quantity)
- : null
-
- if (!i.inventory_item_id || !quantity) {
- return false
- }
-
- return {
- ...i,
- required_quantity: quantity,
- }
- })
- .filter(
- (
- item
- ): item is { required_quantity: number; inventory_item_id: string } =>
- item !== false
- ),
+ inventory_items: (variant.inventory || [])
+ .map(normalizeInventoryItem)
+ .filter((item): item is InventoryItem => item !== null),
prices: Object.entries(variant.prices || {})
- .map(([key, value]: any) => {
- if (value === "" || value === undefined) {
- return undefined
- }
-
- if (key.startsWith("reg_")) {
- return {
- currency_code: regionsCurrencyMap[key],
- amount: castNumber(value),
- rules: { region_id: key },
- }
- } else {
- return {
- currency_code: key,
- amount: castNumber(value),
- }
- }
- })
- .filter((v) => !!v),
+ .map(([key, value]) => normalizePriceItem(key, value, regionsCurrencyMap))
+ .filter((price): price is PriceItem => price !== null),
}))
}
diff --git a/src/routes/products/product-detail/breadcrumb.tsx b/src/routes/products/product-detail/breadcrumb.tsx
index 1abc8805..b1e70d7a 100644
--- a/src/routes/products/product-detail/breadcrumb.tsx
+++ b/src/routes/products/product-detail/breadcrumb.tsx
@@ -1,9 +1,9 @@
-import { HttpTypes } from "@medusajs/types"
-import { UIMatch } from "react-router-dom"
-import { useProduct } from "../../../hooks/api"
+import type { UIMatch } from "react-router-dom"
+import { useProduct } from "@hooks/api"
import { PRODUCT_DETAIL_FIELDS } from "./constants"
+import type { ExtendedAdminProductResponse } from "@custom-types/product"
-type ProductDetailBreadcrumbProps = UIMatch
+type ProductDetailBreadcrumbProps = UIMatch
export const ProductDetailBreadcrumb = (
props: ProductDetailBreadcrumbProps
diff --git a/src/routes/products/product-detail/components/product-additional-attribute-section/product-additional-attribute-section.tsx b/src/routes/products/product-detail/components/product-additional-attribute-section/product-additional-attribute-section.tsx
index f7ee1817..753bf327 100644
--- a/src/routes/products/product-detail/components/product-additional-attribute-section/product-additional-attribute-section.tsx
+++ b/src/routes/products/product-detail/components/product-additional-attribute-section/product-additional-attribute-section.tsx
@@ -14,13 +14,13 @@ import {
import { FormProvider, useForm } from "react-hook-form";
import { useParams } from "react-router-dom";
-import { ActionMenu } from "../../../../../components/common/action-menu";
-import { RouteDrawer } from "../../../../../components/modals";
+import { ActionMenu } from "@components/common/action-menu";
+import { RouteDrawer } from "@components/modals";
import {
useProduct,
useProductAttributes,
useUpdateProduct,
-} from "../../../../../hooks/api";
+} from "@hooks/api";
import { FormComponents } from "./components/form-components";
export const ProductAdditionalAttributeSection = () => {
@@ -39,7 +39,7 @@ export const ProductAdditionalAttributeSection = () => {
const form = useForm({
defaultValues: {},
});
-
+console.log(product?.attribute_values, 'PRODUCT ATTRIBUTE VALUES')
// Reset form when product data is loaded
useEffect(() => {
if (product?.attribute_values) {
diff --git a/src/routes/products/product-detail/components/product-attribute-section/product-attribute-section.tsx b/src/routes/products/product-detail/components/product-attribute-section/product-attribute-section.tsx
index 6813ed58..ccc2578d 100644
--- a/src/routes/products/product-detail/components/product-attribute-section/product-attribute-section.tsx
+++ b/src/routes/products/product-detail/components/product-attribute-section/product-attribute-section.tsx
@@ -1,14 +1,14 @@
import { PencilSquare } from "@medusajs/icons"
-import { HttpTypes } from "@medusajs/types"
import { Container, Heading } from "@medusajs/ui"
import { useTranslation } from "react-i18next"
-import { ActionMenu } from "../../../../../components/common/action-menu"
-import { SectionRow } from "../../../../../components/common/section"
-import { getFormattedCountry } from "../../../../../lib/addresses"
-import { useExtension } from "../../../../../providers/extension-provider"
+import { ActionMenu } from "@components/common/action-menu"
+import { SectionRow } from "@components/common/section"
+import { getFormattedCountry } from "@lib/addresses"
+import { useExtension } from "@providers/extension-provider"
+import type { ExtendedAdminProduct } from "@custom-types/product"
type ProductAttributeSectionProps = {
- product: HttpTypes.AdminProduct
+ product: ExtendedAdminProduct
}
export const ProductAttributeSection = ({
diff --git a/src/routes/products/product-detail/components/product-general-section/product-general-section.tsx b/src/routes/products/product-detail/components/product-general-section/product-general-section.tsx
index 6475b5d4..660d860e 100644
--- a/src/routes/products/product-detail/components/product-general-section/product-general-section.tsx
+++ b/src/routes/products/product-detail/components/product-general-section/product-general-section.tsx
@@ -1,5 +1,4 @@
import { PencilSquare, Trash } from "@medusajs/icons";
-import { HttpTypes } from "@medusajs/types";
import { Container, Heading, StatusBadge, usePrompt } from "@medusajs/ui";
import { useTranslation } from "react-i18next";
@@ -9,6 +8,7 @@ import { ActionMenu } from "../../../../../components/common/action-menu";
import { SectionRow } from "../../../../../components/common/section";
import { useDeleteProduct } from "../../../../../hooks/api/products";
import { useExtension } from "../../../../../providers/extension-provider";
+import type { ExtendedAdminProduct } from "@custom-types/product";
const productStatusColor = (status: string) => {
switch (status) {
@@ -26,7 +26,7 @@ const productStatusColor = (status: string) => {
};
type ProductGeneralSectionProps = {
- product: HttpTypes.AdminProduct;
+ product: ExtendedAdminProduct;
};
export const ProductGeneralSection = ({
diff --git a/src/routes/products/product-detail/components/product-media-section/product-media-section.tsx b/src/routes/products/product-detail/components/product-media-section/product-media-section.tsx
index ce3b2591..934c8856 100644
--- a/src/routes/products/product-detail/components/product-media-section/product-media-section.tsx
+++ b/src/routes/products/product-detail/components/product-media-section/product-media-section.tsx
@@ -13,12 +13,12 @@ import {
import { useState } from "react"
import { useTranslation } from "react-i18next"
import { Link } from "react-router-dom"
-import { ActionMenu } from "../../../../../components/common/action-menu"
-import { useUpdateProduct } from "../../../../../hooks/api/products"
-import { HttpTypes } from "@medusajs/types"
+import { ActionMenu } from "@components/common/action-menu"
+import { useUpdateProduct } from "@hooks/api/products"
+import type { ExtendedAdminProduct } from "@custom-types/product"
type ProductMedisaSectionProps = {
- product: HttpTypes.AdminProduct
+ product: ExtendedAdminProduct
}
export const ProductMediaSection = ({ product }: ProductMedisaSectionProps) => {
@@ -31,7 +31,9 @@ export const ProductMediaSection = ({ product }: ProductMedisaSectionProps) => {
const handleCheckedChange = (id: string) => {
setSelection((prev) => {
if (prev[id]) {
- const { [id]: _, ...rest } = prev
+ const rest = { ...prev }
+ delete rest[id]
+
return rest
} else {
return { ...prev, [id]: true }
@@ -133,10 +135,10 @@ export const ProductMediaSection = ({ product }: ProductMedisaSectionProps) => {
)}
-
+
{t("promotions.form.required")}
@@ -229,7 +298,7 @@ export const RulesFormField = ({
dir={direction}
{...fieldProps}
onValueChange={onValueChange}
- disabled={fieldRule.required}
+ disabled={typedFieldRule.required}
data-testid={`rules-form-field-rule-${ruleType}-${index}-attribute-select`}
>
- {!fieldRule.required && (
+ {!typedFieldRule.required && (
{
- if (!fieldRule.required) {
- setRulesToRemove &&
- setRulesToRemove([...rulesToRemove, fieldRule])
-
- remove(index)
+ if (!typedFieldRule.required && typedFieldRule.id && typedFieldRule.attribute) {
+ const ruleToRemove: RuleToRemove = {
+ id: typedFieldRule.id,
+ attribute: typedFieldRule.attribute,
+ disguised: typedFieldRule.disguised,
+ }
+ if (setRulesToRemove) {
+ const existingIds = new Set((rulesToRemove || []).map((r) => r.id))
+ if (!existingIds.has(ruleToRemove.id)) {
+ setRulesToRemove([...(rulesToRemove || []), ruleToRemove])
+ }
+ }
}
+ remove(index)
}}
data-testid={`rules-form-field-rule-${ruleType}-${index}-remove-button`}
>
@@ -397,12 +475,13 @@ export const RulesFormField = ({
variant="secondary"
className="inline-block"
onClick={() => {
- append({
+ const newRule: FormRule = {
attribute: "",
- operator: "",
+ operator: "" as PromotionRuleOperatorValues,
values: [],
required: false,
- } as any)
+ }
+ append(newRule)
}}
data-testid={`rules-form-field-add-condition-button-${ruleType}`}
>
@@ -415,12 +494,27 @@ export const RulesFormField = ({
variant="transparent"
className="text-ui-fg-muted hover:text-ui-fg-subtle ml-2 inline-block"
onClick={() => {
- const indicesToRemove = fields
- .map((field: any, index) => (field.required ? null : index))
- .filter((f) => f !== null)
-
- setRulesToRemove &&
- setRulesToRemove(fields.filter((field: any) => !field.required))
+ const typedFields = fields as FormRule[]
+ const indicesToRemove = typedFields
+ .map((field, index) => (field.required ? null : index))
+ .filter((f): f is number => f !== null)
+
+ const rulesToRemoveFromFields: RuleToRemove[] = typedFields
+ .filter((field): field is FormRule & { id: string; attribute: string } =>
+ !field.required && !!field.id && !!field.attribute
+ )
+ .map((field) => ({
+ id: field.id,
+ attribute: field.attribute,
+ disguised: field.disguised,
+ }))
+
+ if (setRulesToRemove) {
+ // Merge with existing rulesToRemove, avoiding duplicates
+ const existingIds = new Set((rulesToRemove || []).map((r) => r.id))
+ const newRulesToRemove = rulesToRemoveFromFields.filter((r) => !existingIds.has(r.id))
+ setRulesToRemove([...(rulesToRemove || []), ...newRulesToRemove])
+ }
remove(indicesToRemove)
}}
data-testid={`rules-form-field-clear-all-button-${ruleType}`}
@@ -435,7 +529,7 @@ export const RulesFormField = ({
type DisabledAttributeProps = {
label: string
- field: ControllerRenderProps
+ field: Partial>
}
/**
diff --git a/src/routes/promotions/promotion-add-campaign/components/add-campaign-promotion-form/add-campaign-promotion-form.tsx b/src/routes/promotions/promotion-add-campaign/components/add-campaign-promotion-form/add-campaign-promotion-form.tsx
index d8ea8278..4f21bcc3 100644
--- a/src/routes/promotions/promotion-add-campaign/components/add-campaign-promotion-form/add-campaign-promotion-form.tsx
+++ b/src/routes/promotions/promotion-add-campaign/components/add-campaign-promotion-form/add-campaign-promotion-form.tsx
@@ -93,14 +93,14 @@ export const AddCampaignPromotionFields = ({
data-testid="promotion-add-campaign-form-campaign-choice-radio-group"
>
= {
spend: "spend",
usage: "usage",
use_by_attribute: "useByAttribute",
@@ -118,7 +119,7 @@ export const CampaignDetails = ({ campaign }: CampaignDetailsProps) => {
- {campaign.budget?.type === "use_by_attribute"
+ {(campaign.budget?.type as ExtendedCampaignBudgetType) === "use_by_attribute"
? t("campaigns.fields.totalUsedByAttribute")
: t("campaigns.budget.fields.used")}
diff --git a/src/routes/promotions/promotion-create/components/create-promotion-form/create-promotion-form.tsx b/src/routes/promotions/promotion-create/components/create-promotion-form/create-promotion-form.tsx
index 00bf834f..ad8c3c3b 100644
--- a/src/routes/promotions/promotion-create/components/create-promotion-form/create-promotion-form.tsx
+++ b/src/routes/promotions/promotion-create/components/create-promotion-form/create-promotion-form.tsx
@@ -1,8 +1,9 @@
import { zodResolver } from "@hookform/resolvers/zod"
-import {
+import type {
ApplicationMethodAllocationValues,
ApplicationMethodTargetTypeValues,
ApplicationMethodTypeValues,
+ HttpTypes,
PromotionRuleOperatorValues,
PromotionStatusValues,
PromotionTypeValues,
@@ -16,7 +17,7 @@ import {
Divider,
Heading,
Input,
- ProgressStatus,
+ type ProgressStatus,
ProgressTabs,
RadioGroup,
Switch,
@@ -24,34 +25,33 @@ import {
toast,
} from "@medusajs/ui"
import { useEffect, useMemo, useState } from "react"
-import { useForm, useWatch } from "react-hook-form"
+import { useForm, useWatch, type Path, type PathValue } from "react-hook-form"
import { Trans, useTranslation } from "react-i18next"
import { z } from "zod"
-import { Form } from "../../../../../components/common/form"
-import { DeprecatedPercentageInput } from "../../../../../components/inputs/percentage-input"
+import { Form } from "@/components/common/form"
+import { DeprecatedPercentageInput } from "@/components/inputs/percentage-input"
import {
RouteFocusModal,
useRouteModal,
-} from "../../../../../components/modals"
-import { KeyboundForm } from "../../../../../components/utilities/keybound-form"
-import { useCampaigns } from "../../../../../hooks/api/campaigns"
-import { useCreatePromotion } from "../../../../../hooks/api/promotions"
+} from "@/components/modals"
+import { KeyboundForm } from "@/components/utilities/keybound-form"
+import { useCreatePromotion } from "@/hooks/api/promotions"
import {
currencies,
getCurrencySymbol,
-} from "../../../../../lib/data/currencies"
-import { DEFAULT_CAMPAIGN_VALUES } from "../../../../campaigns/common/constants"
-import { RulesFormField } from "../../../common/edit-rules/components/rules-form-field"
-import { AddCampaignPromotionFields } from "../../../promotion-add-campaign/components/add-campaign-promotion-form"
+} from "@/lib/data/currencies"
+import { DEFAULT_CAMPAIGN_VALUES } from "@/routes/campaigns/common/constants"
+import { RulesFormField } from "@/routes/promotions/common/edit-rules/components/rules-form-field"
+import { AddCampaignPromotionFields } from "@/routes/promotions/promotion-add-campaign/components/add-campaign-promotion-form"
import { Tab } from "./constants"
import { CreatePromotionSchema } from "./form-schema"
import { templates } from "./templates"
-import { useDocumentDirection } from "../../../../../hooks/use-document-direction"
+import { useDocumentDirection } from "@/hooks/use-document-direction"
const defaultValues = {
campaign_id: undefined,
template_id: templates[0].id!,
- campaign_choice: "none" as "none",
+ campaign_choice: "none" as const,
is_automatic: "false",
code: "",
type: "standard" as PromotionTypeValues,
@@ -99,6 +99,7 @@ export const CreatePromotionForm = () => {
template_id: _templateId,
application_method,
rules,
+ campaign: _campaign,
...promotionData
} = data
const {
@@ -113,30 +114,42 @@ export const CreatePromotionForm = () => {
...rules.filter((r) => !!r.disguised),
]
- const applicationMethodRuleData: Record = {}
+ const applicationMethodRuleData: Record = {}
for (const rule of disguisedRules) {
applicationMethodRuleData[rule.attribute] =
rule.field_type === "number"
- ? parseInt(rule.values as string)
+ ? parseInt(String(rule.values), 10)
: rule.values
}
const buildRulesData = (
rules: {
- operator: string
+ operator: PromotionRuleOperatorValues
attribute: string
- values: any[] | any
+ values: string | number | string[]
disguised?: boolean
}[]
- ) => {
+ ): {
+ operator: PromotionRuleOperatorValues
+ attribute: string
+ values: string | string[]
+ }[] => {
return rules
- .filter((r) => !r.disguised)
- .map((rule) => ({
- operator: rule.operator as PromotionRuleOperatorValues,
- attribute: rule.attribute,
- values: rule.values,
- }))
+ .filter((r): r is typeof r & { operator: PromotionRuleOperatorValues } => !r.disguised)
+ .map((rule) => {
+ const values: string | string[] = Array.isArray(rule.values)
+ ? rule.values.map((v) => String(v))
+ : typeof rule.values === "number"
+ ? String(rule.values)
+ : rule.values
+
+ return {
+ operator: rule.operator,
+ attribute: rule.attribute,
+ values,
+ }
+ })
}
if (data.campaign) {
@@ -153,13 +166,13 @@ export const CreatePromotionForm = () => {
application_method: {
...applicationMethodData,
...applicationMethodRuleData,
- value: parseFloat(applicationMethodData.value as string) as number,
+ value: parseFloat(String(applicationMethodData.value)),
target_rules: buildRulesData(targetRulesData),
buy_rules: buildRulesData(buyRulesData),
},
is_tax_inclusive,
is_automatic: is_automatic === "true",
- },
+ } as HttpTypes.AdminCreatePromotion,
{
onSuccess: ({ promotion }) => {
toast.success(
@@ -264,13 +277,17 @@ export const CreatePromotionForm = () => {
reset({ ...defaultValues, template_id: watchTemplateId })
+ type FormData = z.infer
+
for (const [key, value] of Object.entries(currentTemplate.defaults)) {
- if (typeof value === "object") {
+ if (key === "application_method" && typeof value === "object" && value !== null) {
for (const [subKey, subValue] of Object.entries(value)) {
- setValue(`application_method.${subKey}`, subValue)
+ const path = `application_method.${subKey}` as Path
+ setValue(path, subValue as PathValue>)
}
- } else {
- setValue(key, value)
+ } else if (key !== "application_method") {
+ const path = key as Path
+ setValue(path, value as PathValue>)
}
}
@@ -309,17 +326,6 @@ export const CreatePromotionForm = () => {
const isTargetTypeOrder = targetType === "order"
- const formData = form.getValues()
- let campaignQuery: object = {}
-
- if (formData.application_method.currency_code) {
- campaignQuery = {
- budget: { currency_code: formData.application_method.currency_code },
- }
- }
-
- const { campaigns } = useCampaigns(campaignQuery)
-
const watchCampaignChoice = useWatch({
control: form.control,
name: "campaign_choice",
@@ -432,7 +438,7 @@ export const CreatePromotionForm = () => {
{
data-testid="promotion-create-form-method-radio-group"
>
{
/>
{
data-testid="promotion-create-form-status-radio-group"
>
{
/>
{
data-testid="promotion-create-form-type-radio-group"
>
{
/>
{
{
/>
{
)}
- {isTypeStandard &&
- !currentTemplate?.hiddenFields?.includes(
- "application_method.allocation"
- ) && (
+ {isTypeStandard && (
{
-
-
+
+
diff --git a/src/routes/promotions/promotion-create/components/create-promotion-form/form-schema.ts b/src/routes/promotions/promotion-create/components/create-promotion-form/form-schema.ts
index 9dbb81bc..d5ba8411 100644
--- a/src/routes/promotions/promotion-create/components/create-promotion-form/form-schema.ts
+++ b/src/routes/promotions/promotion-create/components/create-promotion-form/form-schema.ts
@@ -1,11 +1,14 @@
import { z } from "zod"
-import { CreateCampaignSchema } from "../../../../campaigns/campaign-create/components/create-campaign-form"
+import { CreateCampaignSchema } from "@/routes/campaigns/campaign-create/components/create-campaign-form"
+import { PROMOTION_RULE_OPERATORS } from "@/routes/promotions/common/constants"
const RuleSchema = z.array(
z.object({
id: z.string().optional(),
attribute: z.string().min(1, { message: "Required field" }),
- operator: z.string().min(1, { message: "Required field" }),
+ operator: z.enum(PROMOTION_RULE_OPERATORS, {
+ message: "Required field",
+ }),
values: z.union([
z.number().min(1, { message: "Required field" }),
z.string().min(1, { message: "Required field" }),
@@ -29,7 +32,7 @@ export const CreatePromotionSchema = z
rules: RuleSchema,
is_tax_inclusive: z.boolean().optional(),
application_method: z.object({
- allocation: z.enum(["each", "across"]),
+ allocation: z.enum(["each", "across", "once"]),
value: z.number().min(0).or(z.string().min(1)),
currency_code: z.string().optional(),
max_quantity: z.number().optional().nullable(),
diff --git a/src/routes/promotions/promotion-detail/components/campaign-section/campaign-section.tsx b/src/routes/promotions/promotion-detail/components/campaign-section/campaign-section.tsx
index c5f2f52c..55fcf09d 100644
--- a/src/routes/promotions/promotion-detail/components/campaign-section/campaign-section.tsx
+++ b/src/routes/promotions/promotion-detail/components/campaign-section/campaign-section.tsx
@@ -1,12 +1,12 @@
import { ArrowUpRightOnBox, PencilSquare } from "@medusajs/icons"
-import { HttpTypes } from "@medusajs/types"
+import type { HttpTypes } from "@medusajs/types"
import { Container, Heading, Text } from "@medusajs/ui"
import { useTranslation } from "react-i18next"
import { useParams } from "react-router-dom"
-import { ActionMenu } from "../../../../../components/common/action-menu"
-import { DateRangeDisplay } from "../../../../../components/common/date-range-display"
-import { NoRecords } from "../../../../../components/common/empty-table-content"
+import { ActionMenu } from "@components/common/action-menu"
+import { DateRangeDisplay } from "@components/common/date-range-display"
+import { NoRecords } from "@components/common/empty-table-content"
const CampaignDetailSection = ({
campaign,
diff --git a/src/routes/promotions/promotion-detail/components/promotion-conditions-section/helpers.ts b/src/routes/promotions/promotion-detail/components/promotion-conditions-section/helpers.ts
new file mode 100644
index 00000000..64bd80e4
--- /dev/null
+++ b/src/routes/promotions/promotion-detail/components/promotion-conditions-section/helpers.ts
@@ -0,0 +1,17 @@
+import type { FormattedPromotionRuleTypes } from "@custom-types/promotion/common"
+import type { ApplicationMethodTargetTypeValues } from "@medusajs/types"
+
+export const getConditionsTitleKey = (
+ ruleType: FormattedPromotionRuleTypes,
+ applicationMethodTargetType?: ApplicationMethodTargetTypeValues
+ ) => {
+ if (ruleType === "target-rules") {
+ if (!applicationMethodTargetType) {
+ throw new Error("target-rules requires applicationMethodTargetType")
+ }
+
+ return `promotions.fields.conditions.target-rules.${applicationMethodTargetType}.title` as const
+ }
+
+ return `promotions.fields.conditions.${ruleType}.title` as const
+ }
\ No newline at end of file
diff --git a/src/routes/promotions/promotion-detail/components/promotion-conditions-section/promotion-conditions-section.tsx b/src/routes/promotions/promotion-detail/components/promotion-conditions-section/promotion-conditions-section.tsx
index 9074d34d..18b31168 100644
--- a/src/routes/promotions/promotion-detail/components/promotion-conditions-section/promotion-conditions-section.tsx
+++ b/src/routes/promotions/promotion-detail/components/promotion-conditions-section/promotion-conditions-section.tsx
@@ -1,14 +1,16 @@
import { PencilSquare } from "@medusajs/icons"
-import { ApplicationMethodTargetTypeValues, HttpTypes, PromotionRuleTypes, } from "@medusajs/types"
+import type { ApplicationMethodTargetTypeValues } from "@medusajs/types"
import { Badge, Container, Heading } from "@medusajs/ui"
import { useTranslation } from "react-i18next"
-import { ActionMenu } from "../../../../../components/common/action-menu"
-import { BadgeListSummary } from "../../../../../components/common/badge-list-summary"
-import { NoRecords } from "../../../../../components/common/empty-table-content"
+import { ActionMenu } from "@/components/common/action-menu"
+import { BadgeListSummary } from "@/components/common/badge-list-summary"
+import { NoRecords } from "@/components/common/empty-table-content"
+import type { ExtendedAdminPromotionRule, FormattedPromotionRuleTypes } from "@custom-types/promotion/common"
+import { getConditionsTitleKey } from "./helpers"
type RuleProps = {
- rule: HttpTypes.AdminPromotionRule
+ rule: ExtendedAdminPromotionRule
}
function RuleBlock({ rule }: RuleProps) {
@@ -32,8 +34,8 @@ function RuleBlock({ rule }: RuleProps) {
className="!txt-compact-small-plus"
list={
rule.field_type === "number"
- ? [rule.values]
- : rule.values?.map((v) => v.label)
+ ? [String(rule.values)]
+ : rule.values?.map((v: { label?: string }) => v.label ?? "").filter(Boolean) ?? []
}
/>
@@ -42,9 +44,9 @@ function RuleBlock({ rule }: RuleProps) {
}
type PromotionConditionsSectionProps = {
- rules: HttpTypes.AdminPromotionRule[]
- ruleType: PromotionRuleTypes
- applicationMethodTargetType: ApplicationMethodTargetTypeValues
+ rules: ExtendedAdminPromotionRule[]
+ ruleType: FormattedPromotionRuleTypes
+ applicationMethodTargetType?: ApplicationMethodTargetTypeValues
}
export const PromotionConditionsSection = ({
@@ -59,11 +61,7 @@ export const PromotionConditionsSection = ({
Loading...
;
}
-
+
return (
<>