@@ -36,7 +36,7 @@ const ID = ({ data }: { data: Cart | Order }) => {
)
}
-const Company = ({ data }: { data: Order | Cart }) => {
+const Company = ({ data }: { data: HttpTypes.AdminOrder }) => {
const { t } = useTranslation()
const company =
data.shipping_address?.company || data.billing_address?.company
@@ -57,11 +57,11 @@ const Company = ({ data }: { data: Order | Cart }) => {
)
}
-const Contact = ({ data }: { data: Cart | Order }) => {
+const Contact = ({ data }: { data: HttpTypes.AdminOrder }) => {
const { t } = useTranslation()
const phone = data.shipping_address?.phone || data.billing_address?.phone
- const email = data.email
+ const email = data.email || ""
return (
@@ -106,7 +106,9 @@ const AddressPrint = ({
address,
type,
}: {
- address: Address | null
+ address:
+ | HttpTypes.AdminOrder["shipping_address"]
+ | HttpTypes.AdminOrder["billing_address"]
type: "shipping" | "billing"
}) => {
const { t } = useTranslation()
@@ -146,7 +148,7 @@ const AddressPrint = ({
)
}
-const Addresses = ({ data }: { data: Cart | Order }) => {
+const Addresses = ({ data }: { data: HttpTypes.AdminOrder }) => {
const { t } = useTranslation()
return (
@@ -183,7 +185,7 @@ export const CustomerInfo = Object.assign(
}
)
-const getCartOrOrderCustomer = (obj: Cart | Order) => {
+const getOrderCustomer = (obj: HttpTypes.AdminOrder) => {
const { first_name: sFirstName, last_name: sLastName } =
obj.shipping_address || {}
const { first_name: bFirstName, last_name: bLastName } =
diff --git a/packages/admin-next/dashboard/src/components/forms/address-form/address-form.tsx b/packages/admin-next/dashboard/src/components/forms/address-form/address-form.tsx
index eb73da67e6..5485882289 100644
--- a/packages/admin-next/dashboard/src/components/forms/address-form/address-form.tsx
+++ b/packages/admin-next/dashboard/src/components/forms/address-form/address-form.tsx
@@ -1,4 +1,3 @@
-import { Country } from "@medusajs/medusa"
import { Heading, Input, Select, clx } from "@medusajs/ui"
import { useTranslation } from "react-i18next"
import { z } from "zod"
@@ -7,12 +6,13 @@ import { Control } from "react-hook-form"
import { AddressSchema } from "../../../lib/schemas"
import { Form } from "../../common/form"
import { CountrySelect } from "../../inputs/country-select"
+import { HttpTypes } from "@medusajs/types"
type AddressFieldValues = z.infer
type AddressFormProps = {
control: Control
- countries?: Country[]
+ countries?: HttpTypes.AdminRegionCountry[]
layout: "grid" | "stack"
}
diff --git a/packages/admin-next/dashboard/src/components/forms/transfer-ownership-form/transfer-ownership-form.tsx b/packages/admin-next/dashboard/src/components/forms/transfer-ownership-form/transfer-ownership-form.tsx
index da2a5aba4b..7c76549c0a 100644
--- a/packages/admin-next/dashboard/src/components/forms/transfer-ownership-form/transfer-ownership-form.tsx
+++ b/packages/admin-next/dashboard/src/components/forms/transfer-ownership-form/transfer-ownership-form.tsx
@@ -1,4 +1,3 @@
-import { Customer, DraftOrder, Order } from "@medusajs/medusa"
import { Select, Text, clx } from "@medusajs/ui"
import { useInfiniteQuery } from "@tanstack/react-query"
import { format } from "date-fns"
@@ -19,6 +18,7 @@ import { TransferOwnershipSchema } from "../../../lib/schemas"
import { Form } from "../../common/form"
import { Skeleton } from "../../common/skeleton"
import { Combobox } from "../../inputs/combobox"
+import { HttpTypes } from "@medusajs/types"
type TransferOwnerShipFieldValues = z.infer
@@ -26,14 +26,16 @@ type TransferOwnerShipFormProps = {
/**
* The Order or DraftOrder to transfer ownership of.
*/
- order: Order | DraftOrder
+ order: HttpTypes.AdminOrder
/**
* React Hook Form control object.
*/
control: Control
}
-const isOrder = (order: Order | DraftOrder): order is Order => {
+const isOrder = (
+ order: HttpTypes.AdminOrder
+): order is HttpTypes.AdminOrder => {
return "customer" in order
}
@@ -90,7 +92,7 @@ export const TransferOwnerShipForm = ({
},
})
- const createLabel = (customer?: Customer) => {
+ const createLabel = (customer?: HttpTypes.AdminCustomer) => {
if (!customer) {
return ""
}
@@ -187,7 +189,7 @@ export const TransferOwnerShipForm = ({
)
}
-const OrderDetailsTable = ({ order }: { order: Order }) => {
+const OrderDetailsTable = ({ order }: { order: HttpTypes.AdminOrder }) => {
const { t } = useTranslation()
const { label: fulfillmentLabel } = getOrderFulfillmentStatus(
@@ -208,7 +210,8 @@ const OrderDetailsTable = ({ order }: { order: Order }) => {
)
}
-const DraftOrderDetailsTable = ({ draft }: { draft: DraftOrder }) => {
+// TODO: Create type for Draft Order when we have it
+const DraftOrderDetailsTable = ({ draft }: { draft: HttpTypes.AdminOrder }) => {
const { t } = useTranslation()
return (
@@ -219,10 +222,12 @@ const DraftOrderDetailsTable = ({ draft }: { draft: DraftOrder }) => {
label={t("fields.status")}
value={t(`draftOrders.status.${draft.status}`)}
/>
-
+ /> */}
)
}
diff --git a/packages/admin-next/dashboard/src/components/table/table-cells/order/country-cell/country-cell.tsx b/packages/admin-next/dashboard/src/components/table/table-cells/order/country-cell/country-cell.tsx
index 33114a4793..e25d14f456 100644
--- a/packages/admin-next/dashboard/src/components/table/table-cells/order/country-cell/country-cell.tsx
+++ b/packages/admin-next/dashboard/src/components/table/table-cells/order/country-cell/country-cell.tsx
@@ -1,9 +1,13 @@
-import { Country } from "@medusajs/medusa"
import { Tooltip } from "@medusajs/ui"
import ReactCountryFlag from "react-country-flag"
import { PlaceholderCell } from "../../common/placeholder-cell"
+import { HttpTypes } from "@medusajs/types"
-export const CountryCell = ({ country }: { country?: Country | null }) => {
+export const CountryCell = ({
+ country,
+}: {
+ country?: HttpTypes.AdminRegionCountry | null
+}) => {
if (!country) {
return
}
@@ -13,7 +17,7 @@ export const CountryCell = ({ country }: { country?: Country | null }) => {
{
+export const CustomerCell = ({
+ customer,
+}: {
+ customer: HttpTypes.AdminCustomer | null
+}) => {
if (!customer) {
return -
}
diff --git a/packages/admin-next/dashboard/src/components/table/table-cells/order/sales-channel-cell/sales-channel-cell.tsx b/packages/admin-next/dashboard/src/components/table/table-cells/order/sales-channel-cell/sales-channel-cell.tsx
index 17e249d041..c451cb12b2 100644
--- a/packages/admin-next/dashboard/src/components/table/table-cells/order/sales-channel-cell/sales-channel-cell.tsx
+++ b/packages/admin-next/dashboard/src/components/table/table-cells/order/sales-channel-cell/sales-channel-cell.tsx
@@ -1,10 +1,10 @@
-import { SalesChannel } from "@medusajs/medusa"
+import { HttpTypes } from "@medusajs/types"
import { useTranslation } from "react-i18next"
export const SalesChannelCell = ({
channel,
}: {
- channel: SalesChannel | null
+ channel: HttpTypes.AdminSalesChannel | null
}) => {
if (!channel) {
return -
diff --git a/packages/admin-next/dashboard/src/components/table/table-cells/region/fulfillment-providers-cell/fulfillment-providers-cell.tsx b/packages/admin-next/dashboard/src/components/table/table-cells/region/fulfillment-providers-cell/fulfillment-providers-cell.tsx
index 6f95a396e5..8ac650ac62 100644
--- a/packages/admin-next/dashboard/src/components/table/table-cells/region/fulfillment-providers-cell/fulfillment-providers-cell.tsx
+++ b/packages/admin-next/dashboard/src/components/table/table-cells/region/fulfillment-providers-cell/fulfillment-providers-cell.tsx
@@ -1,10 +1,10 @@
-import { FulfillmentProvider } from "@medusajs/medusa"
import { useTranslation } from "react-i18next"
import { formatProvider } from "../../../../../lib/format-provider"
import { PlaceholderCell } from "../../common/placeholder-cell"
+import { HttpTypes } from "@medusajs/types"
type FulfillmentProvidersCellProps = {
- fulfillmentProviders?: FulfillmentProvider[] | null
+ fulfillmentProviders?: HttpTypes.AdminFulfillmentProvider[] | null
}
export const FulfillmentProvidersCell = ({
diff --git a/packages/admin-next/dashboard/src/components/table/table-cells/shipping-option/subtotal-requirement-cell/index.ts b/packages/admin-next/dashboard/src/components/table/table-cells/shipping-option/subtotal-requirement-cell/index.ts
deleted file mode 100644
index 8ee08b37d7..0000000000
--- a/packages/admin-next/dashboard/src/components/table/table-cells/shipping-option/subtotal-requirement-cell/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./subtotal-requirement-cell"
diff --git a/packages/admin-next/dashboard/src/components/table/table-cells/shipping-option/subtotal-requirement-cell/subtotal-requirement-cell.tsx b/packages/admin-next/dashboard/src/components/table/table-cells/shipping-option/subtotal-requirement-cell/subtotal-requirement-cell.tsx
deleted file mode 100644
index d9a5733bfa..0000000000
--- a/packages/admin-next/dashboard/src/components/table/table-cells/shipping-option/subtotal-requirement-cell/subtotal-requirement-cell.tsx
+++ /dev/null
@@ -1,43 +0,0 @@
-import { ShippingOption } from "@medusajs/medusa"
-import { useTranslation } from "react-i18next"
-import { MoneyAmountCell } from "../../common/money-amount-cell"
-import { PlaceholderCell } from "../../common/placeholder-cell"
-
-type SubtotalType = "min" | "max"
-
-type SubtotalRequirementCellProps = {
- type: SubtotalType
- shippingOption: ShippingOption
-}
-
-export const SubtotalRequirementCell = (
- props: SubtotalRequirementCellProps
-) => {
- const requirement = props.shippingOption.requirements?.find(
- (r) => r.type === `${props.type}_subtotal`
- )
-
- if (!requirement) {
- return
- }
-
- return (
-
- )
-}
-
-export const SubtotalRequirementHeader = ({ type }: { type: SubtotalType }) => {
- const { t } = useTranslation()
-
- const header =
- type === "min" ? t("fields.minSubtotal") : t("fields.maxSubtotal")
-
- return (
-
- {header}
-
- )
-}
diff --git a/packages/admin-next/dashboard/src/hooks/api/auth.tsx b/packages/admin-next/dashboard/src/hooks/api/auth.tsx
index b994c32f72..7bbcba2d1c 100644
--- a/packages/admin-next/dashboard/src/hooks/api/auth.tsx
+++ b/packages/admin-next/dashboard/src/hooks/api/auth.tsx
@@ -1,11 +1,14 @@
import { UseMutationOptions, useMutation } from "@tanstack/react-query"
import { FetchError } from "@medusajs/js-sdk"
-
import { sdk } from "../../lib/client"
-import { EmailPassReq } from "../../types/api-payloads"
+import { HttpTypes } from "@medusajs/types"
export const useSignInWithEmailPassword = (
- options?: UseMutationOptions
+ options?: UseMutationOptions<
+ string,
+ FetchError,
+ HttpTypes.AdminSignUpWithEmailPassword
+ >
) => {
return useMutation({
mutationFn: (payload) => sdk.auth.login("user", "emailpass", payload),
@@ -17,7 +20,11 @@ export const useSignInWithEmailPassword = (
}
export const useSignUpWithEmailPass = (
- options?: UseMutationOptions
+ options?: UseMutationOptions<
+ string,
+ FetchError,
+ HttpTypes.AdminSignInWithEmailPassword
+ >
) => {
return useMutation({
mutationFn: (payload) => sdk.auth.register("user", "emailpass", payload),
diff --git a/packages/admin-next/dashboard/src/hooks/table/columns/index.ts b/packages/admin-next/dashboard/src/hooks/table/columns/index.ts
index 869b6e3850..5e367512d1 100644
--- a/packages/admin-next/dashboard/src/hooks/table/columns/index.ts
+++ b/packages/admin-next/dashboard/src/hooks/table/columns/index.ts
@@ -9,5 +9,5 @@ export * from "./use-product-type-table-columns"
export * from "./use-region-table-columns"
export * from "./use-return-reason-table-columns"
export * from "./use-sales-channel-table-columns"
-export * from "./use-shipping-option-table-columns"
export * from "./use-tax-rates-table-columns"
+
diff --git a/packages/admin-next/dashboard/src/hooks/table/columns/use-order-table-columns.tsx b/packages/admin-next/dashboard/src/hooks/table/columns/use-order-table-columns.tsx
index 50ca39028f..e28ced6cab 100644
--- a/packages/admin-next/dashboard/src/hooks/table/columns/use-order-table-columns.tsx
+++ b/packages/admin-next/dashboard/src/hooks/table/columns/use-order-table-columns.tsx
@@ -1,4 +1,3 @@
-import { Order } from "@medusajs/medusa"
import {
ColumnDef,
ColumnDefBase,
@@ -34,9 +33,10 @@ import {
TotalCell,
TotalHeader,
} from "../../../components/table/table-cells/order/total-cell"
+import { HttpTypes } from "@medusajs/types"
// We have to use any here, as the type of Order is so complex that it lags the TS server
-const columnHelper = createColumnHelper()
+const columnHelper = createColumnHelper()
type UseOrderTableColumnsProps = {
exclude?: string[]
@@ -52,7 +52,7 @@ export const useOrderTableColumns = (props: UseOrderTableColumnsProps) => {
cell: ({ getValue }) => {
const id = getValue()
- return
+ return
},
}),
columnHelper.accessor("created_at", {
@@ -118,17 +118,19 @@ export const useOrderTableColumns = (props: UseOrderTableColumnsProps) => {
const isAccessorColumnDef = (
c: any
- ): c is ColumnDef & { accessorKey: string } => {
+ ): c is ColumnDef & { accessorKey: string } => {
return c.accessorKey !== undefined
}
const isDisplayColumnDef = (
c: any
- ): c is ColumnDef & { id: string } => {
+ ): c is ColumnDef & { id: string } => {
return c.id !== undefined
}
- const shouldExclude = >(c: TDef) => {
+ const shouldExclude = >(
+ c: TDef
+ ) => {
if (isAccessorColumnDef(c)) {
return exclude.includes(c.accessorKey)
} else if (isDisplayColumnDef(c)) {
@@ -138,5 +140,7 @@ export const useOrderTableColumns = (props: UseOrderTableColumnsProps) => {
return false
}
- return columns.filter((c) => !shouldExclude(c)) as ColumnDef[]
+ return columns.filter(
+ (c) => !shouldExclude(c)
+ ) as ColumnDef[]
}
diff --git a/packages/admin-next/dashboard/src/hooks/table/columns/use-shipping-option-table-columns.tsx b/packages/admin-next/dashboard/src/hooks/table/columns/use-shipping-option-table-columns.tsx
deleted file mode 100644
index 53085e90aa..0000000000
--- a/packages/admin-next/dashboard/src/hooks/table/columns/use-shipping-option-table-columns.tsx
+++ /dev/null
@@ -1,107 +0,0 @@
-import { ShippingOption } from "@medusajs/medusa"
-import { PricedShippingOption } from "@medusajs/medusa/dist/types/pricing"
-import { createColumnHelper } from "@tanstack/react-table"
-import { useMemo } from "react"
-
-import {
- AdminOnlyCell,
- AdminOnlyHeader,
-} from "../../../components/table/table-cells/shipping-option/admin-only-cell"
-import {
- IsReturnCell,
- IsReturnHeader,
-} from "../../../components/table/table-cells/shipping-option/is-return-cell"
-import {
- PriceTypeCell,
- PriceTypeHeader,
-} from "../../../components/table/table-cells/shipping-option/price-type-cell"
-import {
- ShippingOptionCell,
- ShippingOptionHeader,
-} from "../../../components/table/table-cells/shipping-option/shipping-option-cell"
-import {
- ShippingPriceCell,
- ShippingPriceHeader,
-} from "../../../components/table/table-cells/shipping-option/shipping-price-cell/shipping-price-cell"
-import {
- SubtotalRequirementCell,
- SubtotalRequirementHeader,
-} from "../../../components/table/table-cells/shipping-option/subtotal-requirement-cell"
-
-const columnHelper = createColumnHelper()
-
-export const useShippingOptionTableColumns = () => {
- return useMemo(
- () => [
- columnHelper.accessor("name", {
- header: () => ,
- cell: ({ getValue }) => ,
- }),
- columnHelper.accessor("is_return", {
- header: () => ,
- cell: (cell) => {
- const value = cell.getValue()
-
- return
- },
- }),
- columnHelper.accessor("price_type", {
- header: () => ,
- cell: ({ getValue }) => {
- const type = getValue()
-
- return
- },
- }),
- columnHelper.accessor("price_incl_tax", {
- header: () => ,
- cell: ({ getValue, row }) => {
- const isCalculated = row.original.price_type === "calculated"
- const amount = getValue()
- const currencyCode = row.original.region!.currency_code
-
- return (
-
- )
- },
- }),
- columnHelper.display({
- id: "min_amount",
- header: () => ,
- cell: ({ row }) => {
- return (
-
- )
- },
- }),
- columnHelper.display({
- id: "max_amount",
- header: () => ,
- cell: ({ row }) => {
- return (
-
- )
- },
- }),
- columnHelper.accessor("admin_only", {
- header: () => ,
- cell: (cell) => {
- const value = cell.getValue() || false
-
- return
- },
- }),
- ],
- []
- )
-}
diff --git a/packages/admin-next/dashboard/src/hooks/table/query-v2/use-promotion-table-query.tsx b/packages/admin-next/dashboard/src/hooks/table/query-v2/use-promotion-table-query.tsx
index ae2b68b01f..cf586da801 100644
--- a/packages/admin-next/dashboard/src/hooks/table/query-v2/use-promotion-table-query.tsx
+++ b/packages/admin-next/dashboard/src/hooks/table/query-v2/use-promotion-table-query.tsx
@@ -1,4 +1,4 @@
-import { AdminGetPromotionsParams } from "@medusajs/medusa"
+import { HttpTypes } from "@medusajs/types"
import { useQueryParams } from "../../use-query-params"
type UsePromotionTableQueryProps = {
@@ -17,7 +17,7 @@ export const usePromotionTableQuery = ({
const { offset, q, created_at, updated_at } = queryObject
- const searchParams: AdminGetPromotionsParams = {
+ const searchParams: HttpTypes.AdminGetPromotionsParams = {
limit: pageSize,
created_at: created_at ? JSON.parse(created_at) : undefined,
updated_at: updated_at ? JSON.parse(updated_at) : undefined,
diff --git a/packages/admin-next/dashboard/src/hooks/table/query/use-customer-group-table-query.tsx b/packages/admin-next/dashboard/src/hooks/table/query/use-customer-group-table-query.tsx
index 46fd056783..62d3471d5b 100644
--- a/packages/admin-next/dashboard/src/hooks/table/query/use-customer-group-table-query.tsx
+++ b/packages/admin-next/dashboard/src/hooks/table/query/use-customer-group-table-query.tsx
@@ -1,5 +1,4 @@
-import { AdminGetCustomerGroupsParams } from "@medusajs/medusa"
-
+import { HttpTypes } from "@medusajs/types"
import { useQueryParams } from "../../use-query-params"
type UseCustomerGroupTableQueryProps = {
@@ -18,7 +17,7 @@ export const useCustomerGroupTableQuery = ({
const { offset, created_at, updated_at, q, order } = queryObject
- const searchParams: AdminGetCustomerGroupsParams = {
+ const searchParams: HttpTypes.AdminGetCustomerGroupsParams = {
limit: pageSize,
offset: offset ? Number(offset) : 0,
order,
diff --git a/packages/admin-next/dashboard/src/hooks/table/query/use-customer-table-query.tsx b/packages/admin-next/dashboard/src/hooks/table/query/use-customer-table-query.tsx
index c396dbfebe..c925c6060a 100644
--- a/packages/admin-next/dashboard/src/hooks/table/query/use-customer-table-query.tsx
+++ b/packages/admin-next/dashboard/src/hooks/table/query/use-customer-table-query.tsx
@@ -1,4 +1,4 @@
-import { AdminGetCustomersParams } from "@medusajs/medusa"
+import { HttpTypes } from "@medusajs/types"
import { useQueryParams } from "../../use-query-params"
type UseCustomerTableQueryProps = {
@@ -26,7 +26,7 @@ export const useCustomerTableQuery = ({
const { offset, groups, created_at, updated_at, has_account, q, order } =
queryObject
- const searchParams: AdminGetCustomersParams = {
+ const searchParams: HttpTypes.AdminCustomerFilters = {
limit: pageSize,
offset: offset ? Number(offset) : 0,
groups: groups?.split(","),
diff --git a/packages/admin-next/dashboard/src/hooks/table/query/use-order-table-query.tsx b/packages/admin-next/dashboard/src/hooks/table/query/use-order-table-query.tsx
index 41913557b9..ab8f0ed6fa 100644
--- a/packages/admin-next/dashboard/src/hooks/table/query/use-order-table-query.tsx
+++ b/packages/admin-next/dashboard/src/hooks/table/query/use-order-table-query.tsx
@@ -1,4 +1,4 @@
-import { AdminGetOrdersParams } from "@medusajs/medusa"
+import { HttpTypes } from "@medusajs/types"
import { useQueryParams } from "../../use-query-params"
type UseOrderTableQueryProps = {
@@ -37,7 +37,7 @@ export const useOrderTableQuery = ({
order,
} = queryObject
- const searchParams: AdminGetOrdersParams = {
+ const searchParams: HttpTypes.AdminOrderFilters = {
limit: pageSize,
offset: offset ? Number(offset) : 0,
sales_channel_id: sales_channel_id?.split(","),
diff --git a/packages/admin-next/dashboard/src/hooks/table/query/use-shipping-option-table-query.tsx b/packages/admin-next/dashboard/src/hooks/table/query/use-shipping-option-table-query.tsx
index d3fd484471..3be4d0baab 100644
--- a/packages/admin-next/dashboard/src/hooks/table/query/use-shipping-option-table-query.tsx
+++ b/packages/admin-next/dashboard/src/hooks/table/query/use-shipping-option-table-query.tsx
@@ -1,4 +1,4 @@
-import { AdminGetShippingOptionsParams } from "@medusajs/medusa"
+import { HttpTypes } from "@medusajs/types"
import { useQueryParams } from "../../use-query-params"
type UseShippingOptionTableQueryProps = {
@@ -29,10 +29,11 @@ export const useShippingOptionTableQuery = ({
const { offset, order, q, admin_only, is_return, created_at, updated_at } =
queryObject
- const searchParams: AdminGetShippingOptionsParams = {
+ const searchParams: HttpTypes.AdminShippingOptionListParams = {
limit: pageSize,
offset: offset ? Number(offset) : 0,
- region_id: regionId,
+ // TODO: We don't allow region_id in the API yet
+ // region_id: regionId,
is_return: is_return ? is_return === "true" : undefined,
admin_only: admin_only ? admin_only === "true" : undefined,
q,
diff --git a/packages/admin-next/dashboard/src/hooks/table/query/use-tax-rate-table-query.tsx b/packages/admin-next/dashboard/src/hooks/table/query/use-tax-rate-table-query.tsx
index 04fa145750..4b2c69214e 100644
--- a/packages/admin-next/dashboard/src/hooks/table/query/use-tax-rate-table-query.tsx
+++ b/packages/admin-next/dashboard/src/hooks/table/query/use-tax-rate-table-query.tsx
@@ -1,4 +1,4 @@
-import { AdminGetTaxRatesParams } from "@medusajs/medusa"
+import { HttpTypes } from "@medusajs/types"
import { useQueryParams } from "../../use-query-params"
type UseTaxRateTableQueryProps = {
@@ -17,7 +17,7 @@ export const useTaxRateTableQuery = ({
const { offset, q, order, created_at, updated_at } = queryObject
- const searchParams: AdminGetTaxRatesParams = {
+ const searchParams: HttpTypes.AdminTaxRateListParams = {
limit: pageSize,
offset: offset ? Number(offset) : 0,
order,
diff --git a/packages/admin-next/dashboard/src/lib/addresses.ts b/packages/admin-next/dashboard/src/lib/addresses.ts
index c9177371c2..3c4b233996 100644
--- a/packages/admin-next/dashboard/src/lib/addresses.ts
+++ b/packages/admin-next/dashboard/src/lib/addresses.ts
@@ -1,8 +1,11 @@
-import { AddressDTO } from "@medusajs/types"
+import { HttpTypes } from "@medusajs/types"
import { countries, getCountryByIso2 } from "./data/countries"
-export const isSameAddress = (a: AddressDTO | null, b: AddressDTO | null) => {
+export const isSameAddress = (
+ a?: HttpTypes.AdminOrderAddress | null,
+ b?: HttpTypes.AdminOrderAddress | null
+) => {
if (!a || !b) {
return false
}
@@ -22,7 +25,7 @@ export const isSameAddress = (a: AddressDTO | null, b: AddressDTO | null) => {
export const getFormattedAddress = ({
address,
}: {
- address?: Partial | null
+ address?: HttpTypes.AdminOrderAddress | null
}) => {
if (!address) {
return []
@@ -70,7 +73,7 @@ export const getFormattedAddress = ({
}
if (country) {
- formattedAddress.push(country.display_name)
+ formattedAddress.push(country.display_name!)
} else if (country_code) {
const country = getCountryByIso2(country_code)
diff --git a/packages/admin-next/dashboard/src/providers/router-provider/route-map.tsx b/packages/admin-next/dashboard/src/providers/router-provider/route-map.tsx
index 9ceecb26e9..2c88205073 100644
--- a/packages/admin-next/dashboard/src/providers/router-provider/route-map.tsx
+++ b/packages/admin-next/dashboard/src/providers/router-provider/route-map.tsx
@@ -9,7 +9,6 @@ import { ProtectedRoute } from "../../components/authentication/protected-route"
import { MainLayout } from "../../components/layout/main-layout"
import { SettingsLayout } from "../../components/layout/settings-layout"
import { ErrorBoundary } from "../../components/utilities/error-boundary"
-import { PriceListRes } from "../../types/api-responses"
import { getCountryByIso2 } from "../../lib/data/countries"
import {
@@ -415,7 +414,8 @@ export const RouteMap: RouteObject[] = [
lazy: () =>
import("../../routes/price-lists/price-list-detail"),
handle: {
- crumb: (data: PriceListRes) => data.price_list.title,
+ crumb: (data: HttpTypes.AdminPriceListResponse) =>
+ data.price_list.title,
},
children: [
{
diff --git a/packages/admin-next/dashboard/src/routes/customers/customer-detail/components/customer-order-section/customer-order-section.tsx b/packages/admin-next/dashboard/src/routes/customers/customer-detail/components/customer-order-section/customer-order-section.tsx
index 2d6c198f4a..190913feca 100644
--- a/packages/admin-next/dashboard/src/routes/customers/customer-detail/components/customer-order-section/customer-order-section.tsx
+++ b/packages/admin-next/dashboard/src/routes/customers/customer-detail/components/customer-order-section/customer-order-section.tsx
@@ -1,5 +1,4 @@
import { ArrowPath } from "@medusajs/icons"
-import { Customer, Order } from "@medusajs/medusa"
import { Button, Container, Heading } from "@medusajs/ui"
import { keepPreviousData } from "@tanstack/react-query"
import { createColumnHelper } from "@tanstack/react-table"
@@ -12,9 +11,10 @@ import { useOrderTableColumns } from "../../../../../hooks/table/columns/use-ord
import { useOrderTableFilters } from "../../../../../hooks/table/filters/use-order-table-filters"
import { useOrderTableQuery } from "../../../../../hooks/table/query/use-order-table-query"
import { useDataTable } from "../../../../../hooks/use-data-table"
+import { HttpTypes } from "@medusajs/types"
type CustomerGeneralSectionProps = {
- customer: Customer
+ customer: HttpTypes.AdminCustomer
}
const PAGE_SIZE = 10
@@ -83,7 +83,7 @@ export const CustomerOrderSection = ({
)
}
-const CustomerOrderActions = ({ order }: { order: Order }) => {
+const CustomerOrderActions = ({ order }: { order: HttpTypes.AdminOrder }) => {
const { t } = useTranslation()
return (
@@ -103,7 +103,7 @@ const CustomerOrderActions = ({ order }: { order: Order }) => {
)
}
-const columnHelper = createColumnHelper()
+const columnHelper = createColumnHelper()
const useColumns = () => {
const base = useOrderTableColumns({ exclude: ["customer"] })
diff --git a/packages/admin-next/dashboard/src/routes/customers/customer-transfer-ownership/components/transfer-customer-order-ownership-form/transfer-customer-order-ownership-form.tsx b/packages/admin-next/dashboard/src/routes/customers/customer-transfer-ownership/components/transfer-customer-order-ownership-form/transfer-customer-order-ownership-form.tsx
index a9afde1924..5b4c85f841 100644
--- a/packages/admin-next/dashboard/src/routes/customers/customer-transfer-ownership/components/transfer-customer-order-ownership-form/transfer-customer-order-ownership-form.tsx
+++ b/packages/admin-next/dashboard/src/routes/customers/customer-transfer-ownership/components/transfer-customer-order-ownership-form/transfer-customer-order-ownership-form.tsx
@@ -1,18 +1,15 @@
import { zodResolver } from "@hookform/resolvers/zod"
-import { Order } from "@medusajs/medusa"
import { Button } from "@medusajs/ui"
import { useForm } from "react-hook-form"
import { useTranslation } from "react-i18next"
import { z } from "zod"
import { TransferOwnerShipForm } from "../../../../../components/forms/transfer-ownership-form"
-import {
- RouteDrawer,
- useRouteModal,
-} from "../../../../../components/modals"
+import { RouteDrawer, useRouteModal } from "../../../../../components/modals"
import { TransferOwnershipSchema } from "../../../../../lib/schemas"
+import { HttpTypes } from "@medusajs/types"
type TransferCustomerOrderOwnershipFormProps = {
- order: Order
+ order: HttpTypes.AdminOrder
}
export const TransferCustomerOrderOwnershipForm = ({
@@ -23,7 +20,7 @@ export const TransferCustomerOrderOwnershipForm = ({
const form = useForm>({
defaultValues: {
- current_owner_id: order.customer_id,
+ current_owner_id: order.customer_id ?? undefined,
new_owner_id: "",
},
resolver: zodResolver(TransferOwnershipSchema),
diff --git a/packages/admin-next/dashboard/src/routes/inventory/inventory-detail/components/inventory-item-location-levels.tsx b/packages/admin-next/dashboard/src/routes/inventory/inventory-detail/components/inventory-item-location-levels.tsx
index 993daf33d0..3ca7071f65 100644
--- a/packages/admin-next/dashboard/src/routes/inventory/inventory-detail/components/inventory-item-location-levels.tsx
+++ b/packages/admin-next/dashboard/src/routes/inventory/inventory-detail/components/inventory-item-location-levels.tsx
@@ -1,12 +1,11 @@
import { Button, Container, Heading } from "@medusajs/ui"
-
-import { InventoryItemRes } from "../../../../types/api-responses"
import { ItemLocationListTable } from "./location-levels-table/location-list-table"
import { Link } from "react-router-dom"
import { useTranslation } from "react-i18next"
+import { HttpTypes } from "@medusajs/types"
type InventoryItemLocationLevelsSectionProps = {
- inventoryItem: InventoryItemRes["inventory_item"]
+ inventoryItem: HttpTypes.AdminInventoryItemResponse["inventory_item"]
}
export const InventoryItemLocationLevelsSection = ({
inventoryItem,
diff --git a/packages/admin-next/dashboard/src/routes/inventory/inventory-detail/components/inventory-item-reservations.tsx b/packages/admin-next/dashboard/src/routes/inventory/inventory-detail/components/inventory-item-reservations.tsx
index 242d8950a5..532644b700 100644
--- a/packages/admin-next/dashboard/src/routes/inventory/inventory-detail/components/inventory-item-reservations.tsx
+++ b/packages/admin-next/dashboard/src/routes/inventory/inventory-detail/components/inventory-item-reservations.tsx
@@ -1,12 +1,11 @@
import { Button, Container, Heading } from "@medusajs/ui"
-
-import { InventoryItemRes } from "../../../../types/api-responses"
import { Link } from "react-router-dom"
import { ReservationItemTable } from "./reservations-table/reservation-list-table"
import { useTranslation } from "react-i18next"
+import { HttpTypes } from "@medusajs/types"
type InventoryItemLocationLevelsSectionProps = {
- inventoryItem: InventoryItemRes["inventory_item"]
+ inventoryItem: HttpTypes.AdminInventoryItemResponse["inventory_item"]
}
export const InventoryItemReservationsSection = ({
inventoryItem,
diff --git a/packages/admin-next/dashboard/src/routes/inventory/inventory-detail/components/reservations-table/reservation-actions.tsx b/packages/admin-next/dashboard/src/routes/inventory/inventory-detail/components/reservations-table/reservation-actions.tsx
index b862f1cedd..a2726e9887 100644
--- a/packages/admin-next/dashboard/src/routes/inventory/inventory-detail/components/reservations-table/reservation-actions.tsx
+++ b/packages/admin-next/dashboard/src/routes/inventory/inventory-detail/components/reservations-table/reservation-actions.tsx
@@ -1,7 +1,7 @@
import { PencilSquare, Trash } from "@medusajs/icons"
import { toast, usePrompt } from "@medusajs/ui"
-import { InventoryTypes } from "@medusajs/types"
+import { HttpTypes } from "@medusajs/types"
import { useTranslation } from "react-i18next"
import { ActionMenu } from "../../../../../components/common/action-menu"
import { useDeleteReservationItem } from "../../../../../hooks/api/reservations"
@@ -9,7 +9,7 @@ import { useDeleteReservationItem } from "../../../../../hooks/api/reservations"
export const ReservationActions = ({
reservation,
}: {
- reservation: InventoryTypes.ReservationItemDTO
+ reservation: HttpTypes.AdminReservation
}) => {
const { t } = useTranslation()
const prompt = usePrompt()
diff --git a/packages/admin-next/dashboard/src/routes/inventory/inventory-detail/components/reservations-table/reservation-list-table.tsx b/packages/admin-next/dashboard/src/routes/inventory/inventory-detail/components/reservations-table/reservation-list-table.tsx
index e64904d678..4eaad45935 100644
--- a/packages/admin-next/dashboard/src/routes/inventory/inventory-detail/components/reservations-table/reservation-list-table.tsx
+++ b/packages/admin-next/dashboard/src/routes/inventory/inventory-detail/components/reservations-table/reservation-list-table.tsx
@@ -1,10 +1,13 @@
import { useMemo } from "react"
-import { InventoryTypes } from "@medusajs/types"
+import { HttpTypes } from "@medusajs/types"
import { DataTable } from "../../../../../components/table/data-table"
import { useDataTable } from "../../../../../hooks/use-data-table"
import { useReservationItems } from "../../../../../hooks/api/reservations"
-import { useReservationTableColumn } from "./use-reservation-list-table-columns"
+import {
+ ExtendedReservationItem,
+ useReservationTableColumn,
+} from "./use-reservation-list-table-columns"
import { useReservationsTableQuery } from "./use-reservation-list-table-query"
import { useStockLocations } from "../../../../../hooks/api"
@@ -13,7 +16,7 @@ const PAGE_SIZE = 20
export const ReservationItemTable = ({
inventoryItem,
}: {
- inventoryItem: InventoryTypes.InventoryItemDTO
+ inventoryItem: HttpTypes.AdminInventoryItemResponse["inventory_item"]
}) => {
const { searchParams, raw } = useReservationsTableQuery({
pageSize: PAGE_SIZE,
@@ -29,7 +32,7 @@ export const ReservationItemTable = ({
id: (reservations || []).map((r) => r.location_id),
})
- const data = useMemo(() => {
+ const data = useMemo(() => {
const locationMap = new Map((stock_locations || []).map((l) => [l.id, l]))
return (reservations || []).map((r) => ({
@@ -45,7 +48,7 @@ export const ReservationItemTable = ({
columns,
count,
enablePagination: true,
- getRowId: (row: InventoryTypes.ReservationItemDTO) => row.id,
+ getRowId: (row: ExtendedReservationItem) => row.id,
pageSize: PAGE_SIZE,
})
diff --git a/packages/admin-next/dashboard/src/routes/inventory/inventory-detail/components/reservations-table/use-reservation-list-table-columns.tsx b/packages/admin-next/dashboard/src/routes/inventory/inventory-detail/components/reservations-table/use-reservation-list-table-columns.tsx
index 3e256b0eb2..997c2806cb 100644
--- a/packages/admin-next/dashboard/src/routes/inventory/inventory-detail/components/reservations-table/use-reservation-list-table-columns.tsx
+++ b/packages/admin-next/dashboard/src/routes/inventory/inventory-detail/components/reservations-table/use-reservation-list-table-columns.tsx
@@ -1,19 +1,17 @@
-import { InventoryTypes, StockLocationDTO } from "@medusajs/types"
-
+import { HttpTypes } from "@medusajs/types"
import { PlaceholderCell } from "../../../../../components/table/table-cells/common/placeholder-cell"
import { ReservationActions } from "./reservation-actions"
import { createColumnHelper } from "@tanstack/react-table"
import { useMemo } from "react"
import { useTranslation } from "react-i18next"
-import { DateCell } from "../../../../../components/table/table-cells/common/date-cell"
import { CreatedAtCell } from "../../../../../components/table/table-cells/common/created-at-cell"
/**
* Adds missing properties to the InventoryItemDTO type.
*/
-interface ExtendedReservationItem extends InventoryTypes.ReservationItemDTO {
- line_item: { order_id: string }
- location: StockLocationDTO
+export interface ExtendedReservationItem extends HttpTypes.AdminReservation {
+ line_item?: { order_id: string }
+ location?: HttpTypes.AdminStockLocation
}
const columnHelper = createColumnHelper()
diff --git a/packages/admin-next/dashboard/src/routes/orders/order-create-fulfillment/components/order-create-fulfillment-form/order-create-fulfillment-item.tsx b/packages/admin-next/dashboard/src/routes/orders/order-create-fulfillment/components/order-create-fulfillment-form/order-create-fulfillment-item.tsx
index 3dbb7cdfd0..70b731c8e2 100644
--- a/packages/admin-next/dashboard/src/routes/orders/order-create-fulfillment/components/order-create-fulfillment-form/order-create-fulfillment-item.tsx
+++ b/packages/admin-next/dashboard/src/routes/orders/order-create-fulfillment/components/order-create-fulfillment-form/order-create-fulfillment-item.tsx
@@ -2,8 +2,6 @@ import { Trash } from "@medusajs/icons"
import { useMemo } from "react"
import { useTranslation } from "react-i18next"
import * as zod from "zod"
-
-import { LineItem } from "@medusajs/medusa"
import { Input, Text } from "@medusajs/ui"
import { UseFormReturn } from "react-hook-form"
@@ -14,9 +12,10 @@ import { MoneyAmountCell } from "../../../../../components/table/table-cells/com
import { useProductVariant } from "../../../../../hooks/api/products.tsx"
import { getFulfillableQuantity } from "../../../../../lib/order-item.ts"
import { CreateFulfillmentSchema } from "./constants.ts"
+import { HttpTypes } from "@medusajs/types"
type OrderEditItemProps = {
- item: LineItem
+ item: HttpTypes.AdminOrderLineItem
currencyCode: string
locationId?: string
onItemRemove: (itemId: string) => void
@@ -33,8 +32,8 @@ export function OrderCreateFulfillmentItem({
const { t } = useTranslation()
const { variant } = useProductVariant(
- item.variant.product_id,
- item.variant_id,
+ item.variant!.product_id!,
+ item.variant_id!,
{
fields: "*inventory,*inventory.location_levels",
}
@@ -79,10 +78,10 @@ export function OrderCreateFulfillmentItem({
{item.title}
- {item.variant.sku && ({item.variant.sku})}
+ {item.variant?.sku && ({item.variant.sku})}
- {item.variant.title}
+ {item.variant?.title ?? ""}