@medusajs/dashboard 3.0.0-preview-20251203060132 → 3.0.0-preview-20251211180557

package/src/routes/orders/order-create-claim/components/claim-create-form/claim-create-form.tsx

@@ -568,6 +568,16 @@ export const ClaimCreateForm = ({
     }
   }, [])
 
+  /**
+   * For estimated difference show pending difference and subtract the total of inbound items (assume all items will be returned correctly)
+   * We don't include inbound total in the pending difference because it will be considered returned when the receive flow is completed
+   */
+  const estimatedDifference =
+    preview.summary.pending_difference -
+    inboundPreviewItems.reduce((acc, item) => {
+      return acc + item.total
+    }, 0)
+
   const inboundShippingTotal = useMemo(() => {
     const method = preview.shipping_methods.find(
       (sm) =>
@@ -1010,10 +1020,7 @@ export const ClaimCreateForm = ({
                   {t("orders.claims.refundAmount")}
                 </span>
                 <span className="txt-small font-medium">
-                  {getStylizedAmount(
-                    preview.summary.pending_difference,
-                    order.currency_code
-                  )}
+                  {getStylizedAmount(estimatedDifference, order.currency_code)}
                 </span>
               </div>
             </div>

package/src/routes/orders/order-create-exchange/components/exchange-create-form/exchange-create-form.tsx

@@ -272,6 +272,16 @@ export const ExchangeCreateForm = ({
     }
   }, [])
 
+  /**
+   * For estimated difference show pending difference and subtract the total of inbound items (assume all items will be returned correctly)
+   * We don't include inbound total in the pending difference because it will be considered returned when the receive flow is completed
+   */
+  const estimatedDifference =
+    preview.summary.pending_difference -
+    inboundPreviewItems.reduce((acc, item) => {
+      return acc + item.total
+    }, 0)
+
   const inboundShippingTotal = useMemo(() => {
     const method = preview.shipping_methods.find(
       (sm) =>
@@ -516,10 +526,7 @@ export const ExchangeCreateForm = ({
                   {t("orders.exchanges.refundAmount")}
                 </span>
                 <span className="txt-small font-medium">
-                  {getStylizedAmount(
-                    preview.summary.pending_difference,
-                    order.currency_code
-                  )}
+                  {getStylizedAmount(estimatedDifference, order.currency_code)}
                 </span>
               </div>
             </div>

package/src/routes/orders/order-create-return/components/return-create-form/return-create-form.tsx

@@ -402,6 +402,16 @@ export const ReturnCreateForm = ({
     return method?.total || 0
   }, [preview.shipping_methods])
 
+  /**
+   * For estimated difference show pending difference and subtract the total of inbound items (assume all items will be returned correctly)
+   * We don't include inbound total in the pending difference because it will be considered returned when the receive flow is completed
+   */
+  const estimatedDifference =
+    preview.summary.pending_difference -
+    previewItems.reduce((acc, item) => {
+      return acc + item.total
+    }, 0)
+
   return (
     <RouteFocusModal.Form
       form={form}
@@ -707,10 +717,7 @@ export const ReturnCreateForm = ({
                   {t("orders.returns.estDifference")}
                 </span>
                 <span className="txt-small font-medium">
-                  {getStylizedAmount(
-                    preview.summary.pending_difference,
-                    order.currency_code
-                  )}
+                  {getStylizedAmount(estimatedDifference, order.currency_code)}
                 </span>
               </div>
             </div>

package/src/routes/orders/order-list/const.ts

@@ -11,7 +11,7 @@ export const DEFAULT_PROPERTIES = [
   "currency_code",
 ]
 
-export const DEFAULT_RELATIONS = ["*customer", "*sales_channel"]
+export const DEFAULT_RELATIONS = ["*customer", "*sales_channel", "*payment_collections"]
 
 export const DEFAULT_FIELDS = `${DEFAULT_PROPERTIES.join(
   ","

package/src/routes/price-lists/price-list-create/components/price-list-create-form/price-list-prices-form.tsx

@@ -35,7 +35,9 @@ export const PriceListPricesForm = ({
   const { products, isLoading, isError, error } = useProducts({
     id: ids.map((id) => id.id),
     limit: ids.length,
-    fields: "title,thumbnail,*variants",
+    // TODO: Remove exclusion once we avoid including unnecessary relations by default in the query config
+    fields:
+      "title,thumbnail,*variants,-type,-collection,-options,-tags,-images,-sales_channels",
   })
 
   const { setCloseOnEscape } = useRouteModal()

package/src/routes/price-lists/price-list-create/components/price-list-create-form/price-list-products-form.tsx

@@ -109,6 +109,7 @@ export const PriceListProductsForm = ({ form }: PriceListProductsFormProps) => {
       updater,
     },
     pageSize: PAGE_SIZE,
+    prefix: PREFIX,
   })
 
   if (isError) {

package/src/routes/price-lists/price-list-detail/components/price-list-general-section/price-list-general-section.tsx

@@ -6,6 +6,7 @@ import { useTranslation } from "react-i18next"
 import { ActionMenu } from "../../../../../components/common/action-menu"
 import { useDeletePriceListAction } from "../../../common/hooks/use-delete-price-list-action"
 import { getPriceListStatus } from "../../../common/utils"
+import { usePriceListPrices } from "../../../../../hooks/api"
 
 type PriceListGeneralSectionProps = {
   priceList: HttpTypes.AdminPriceList
@@ -15,8 +16,13 @@ export const PriceListGeneralSection = ({
   priceList,
 }: PriceListGeneralSectionProps) => {
   const { t } = useTranslation()
-
-  const overrideCount = priceList.prices?.length || 0
+  const {
+    count: overrideCount,
+    isLoading,
+    error,
+  } = usePriceListPrices(priceList.id, {
+    limit: 1,
+  })
 
   const { color, text } = getPriceListStatus(t, priceList)
 
@@ -77,9 +83,11 @@ export const PriceListGeneralSection = ({
         <Text leading="compact" size="small" weight="plus">
           {t("priceLists.fields.priceOverrides.label")}
         </Text>
-        <Text size="small" className="text-pretty">
-          {overrideCount || "-"}
-        </Text>
+        {!isLoading && !error && (
+          <Text size="small" className="text-pretty">
+            {overrideCount || "-"}
+          </Text>
+        )}
       </div>
     </Container>
   )

package/src/routes/price-lists/price-list-list/components/price-list-list-table/price-count-cell.tsx

@@ -0,0 +1,19 @@
+import { usePriceListPrices } from "../../../../../hooks/api/price-lists"
+import { PlaceholderCell } from "../../../../../components/table/table-cells/common/placeholder-cell"
+import { TextCell } from "../../../../../components/table/table-cells/common/text-cell"
+
+type PriceCountCellProps = {
+  priceListId: string
+}
+
+export const PriceCountCell = ({ priceListId }: PriceCountCellProps) => {
+  const { count, isLoading } = usePriceListPrices(priceListId, {
+    limit: 1,
+  })
+
+  if (isLoading) {
+    return <PlaceholderCell />
+  }
+
+  return <TextCell text={count && count > 0 ? count.toString() : "-"} />
+}

package/src/routes/price-lists/price-list-list/components/price-list-list-table/use-pricing-table-columns.tsx

@@ -4,12 +4,10 @@ import { useMemo } from "react"
 import { useTranslation } from "react-i18next"
 
 import { StatusCell } from "../../../../../components/table/table-cells/common/status-cell"
-import {
-  TextCell,
-  TextHeader,
-} from "../../../../../components/table/table-cells/common/text-cell"
+import { TextHeader } from "../../../../../components/table/table-cells/common/text-cell"
 import { getPriceListStatus } from "../../../common/utils"
 import { PriceListListTableActions } from "./price-list-list-table-actions"
+import { PriceCountCell } from "./price-count-cell"
 
 const columnHelper = createColumnHelper<HttpTypes.AdminPriceList>()
 
@@ -30,9 +28,10 @@ export const usePricingTableColumns = () => {
           return <StatusCell color={color}>{text}</StatusCell>
         },
       }),
-      columnHelper.accessor("prices", {
+      columnHelper.display({
+        id: "price_overrides",
         header: t("priceLists.fields.priceOverrides.header"),
-        cell: (info) => <TextCell text={`${info.getValue()?.length || "-"}`} />,
+        cell: ({ row }) => <PriceCountCell priceListId={row.original.id} />,
       }),
       columnHelper.display({
         id: "actions",

package/src/routes/price-lists/price-list-prices-add/components/price-list-prices-add-form/price-list-prices-add-prices-form.tsx

@@ -36,7 +36,9 @@ export const PriceListPricesAddPricesForm = ({
   const { products, isLoading, isError, error } = useProducts({
     id: ids.map((id) => id.id),
     limit: ids.length,
-    fields: "title,thumbnail,*variants",
+    // TODO: Remove exclusion once we avoid including unnecessary relations by default in the query config
+    fields:
+      "title,thumbnail,*variants,-type,-collection,-options,-tags,-images,-sales_channels",
   })
 
   const { setValue } = form

package/src/routes/price-lists/price-list-prices-add/price-list-prices-add.tsx

@@ -7,7 +7,10 @@ import { PriceListPricesAddForm } from "./components/price-list-prices-add-form"
 export const PriceListProductsAdd = () => {
   const { id } = useParams<{ id: string }>()
 
-  const { price_list, isPending, isError, error } = usePriceList(id!)
+  const { price_list, isPending, isError, error } = usePriceList(id!, {
+    fields:
+      "*prices,prices.price_set.variant.id,prices.price_rules.attribute,prices.price_rules.value",
+  })
   const { currencies, regions, pricePreferences, isReady } =
     usePriceListCurrencyData()
 

package/src/routes/price-lists/price-list-prices-edit/price-list-prices-edit.tsx

@@ -10,7 +10,9 @@ export const PriceListPricesEdit = () => {
   const [searchParams] = useSearchParams()
   const ids = searchParams.get("ids[]")
 
-  const { price_list, isLoading, isError, error } = usePriceList(id!)
+  const { price_list, isLoading, isError, error } = usePriceList(id!, {
+    fields: "*prices,prices.price_set.variant.id,prices.price_rules.attribute,prices.price_rules.value",
+  })
   const productIds = ids?.split(",")
 
   const {
@@ -22,7 +24,9 @@ export const PriceListPricesEdit = () => {
     id: productIds,
     limit: productIds?.length || 9999, // Temporary until we support lazy loading in the DataGrid
     price_list_id: [id!],
-    fields: "title,thumbnail,*variants",
+    // TODO: Remove exclusion once we avoid including unnecessary relations by default in the query config
+    fields:
+      "title,thumbnail,*variants,-type,-collection,-options,-tags,-images,-sales_channels",
   })
 
   const { isReady, regions, currencies, pricePreferences } =

package/src/routes/product-variants/product-variant-edit/product-variant-edit.tsx

@@ -33,7 +33,8 @@ export const ProductVariantEdit = () => {
   } = useProduct(
     variant?.product_id!,
     {
-      fields: "-variants",
+      // TODO: Remove exclusion once we avoid including unnecessary relations by default in the query config
+      fields: "-type,-collection,-tags,-images,-variants,-sales_channels",
     },
     {
       enabled: !!variant?.product_id,

package/src/routes/products/product-attributes/product-attributes.tsx

@@ -4,7 +4,6 @@ import { useParams } from "react-router-dom"
 
 import { RouteDrawer } from "../../../components/modals"
 import { useProduct } from "../../../hooks/api/products"
-import { PRODUCT_DETAIL_FIELDS } from "../product-detail/constants"
 import { ProductAttributesForm } from "./components/product-attributes-form"
 
 export const ProductAttributes = () => {
@@ -12,7 +11,9 @@ export const ProductAttributes = () => {
   const { t } = useTranslation()
 
   const { product, isLoading, isError, error } = useProduct(id!, {
-    fields: PRODUCT_DETAIL_FIELDS,
+    // TODO: Remove exclusion once we avoid including unnecessary relations by default in the query config
+    fields:
+      "-type,-collection,-options,-tags,-images,-variants,-sales_channels",
   })
 
   if (isError) {

package/src/routes/products/product-create-option/product-create-option.tsx

@@ -9,7 +9,11 @@ export const ProductCreateOption = () => {
   const { id } = useParams()
   const { t } = useTranslation()
 
-  const { product, isLoading, isError, error } = useProduct(id!)
+  const { product, isLoading, isError, error } = useProduct(id!, {
+    // TODO: Remove exclusion once we avoid including unnecessary relations by default in the query config
+    fields:
+      "-type,-collection,-options,-tags,-images,-variants,-sales_channels",
+  })
 
   if (isError) {
     throw error

package/src/routes/products/product-create-variant/product-create-variant.tsx

@@ -6,7 +6,10 @@ import { CreateProductVariantForm } from "./components/create-product-variant-fo
 export const ProductCreateVariant = () => {
   const { id } = useParams()
 
-  const { product, isLoading, isError, error } = useProduct(id!)
+  const { product, isLoading, isError, error } = useProduct(id!, {
+    // TODO: Remove exclusion once we avoid including unnecessary relations by default in the query config
+    fields: "-type,-collection,-tags,-images,-variants,-sales_channels",
+  })
 
   if (isError) {
     throw error

package/src/routes/products/product-detail/breadcrumb.tsx

@@ -1,7 +1,6 @@
 import { HttpTypes } from "@medusajs/types"
 import { UIMatch } from "react-router-dom"
 import { useProduct } from "../../../hooks/api"
-import { PRODUCT_DETAIL_FIELDS } from "./constants"
 
 type ProductDetailBreadcrumbProps = UIMatch<HttpTypes.AdminProductResponse>
 
@@ -13,7 +12,9 @@ export const ProductDetailBreadcrumb = (
   const { product } = useProduct(
     id!,
     {
-      fields: PRODUCT_DETAIL_FIELDS,
+      // TODO: Remove exclusion once we avoid including unnecessary relations by default in the query config
+      fields:
+        "-type,-collection,-options,-tags,-images,-variants,-sales_channels",
     },
     {
       initialData: props.data,

package/src/routes/products/product-edit/product-edit.tsx

@@ -4,7 +4,6 @@ import { useParams } from "react-router-dom"
 
 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"
 
 export const ProductEdit = () => {
@@ -12,7 +11,9 @@ export const ProductEdit = () => {
   const { t } = useTranslation()
 
   const { product, isLoading, isError, error } = useProduct(id!, {
-    fields: PRODUCT_DETAIL_FIELDS,
+    // TODO: Remove exclusion once we avoid including unnecessary relations by default in the query config
+    fields:
+      "-type,-collection,-options,-tags,-images,-variants,-sales_channels",
   })
 
   if (isError) {

package/src/routes/products/product-edit-option/product-edit-option.tsx

@@ -9,7 +9,10 @@ export const ProductEditOption = () => {
   const { id, option_id } = useParams()
   const { t } = useTranslation()
 
-  const { product, isPending, isFetching, isError, error } = useProduct(id!)
+  const { product, isPending, isFetching, isError, error } = useProduct(id!, {
+    // TODO: Remove exclusion once we avoid including unnecessary relations by default in the query config
+    fields: "-type,-collection,-tags,-images,-variants,-sales_channels",
+  })
 
   const option = product?.options.find((o) => o.id === option_id)
 

package/src/routes/products/product-image-variants-edit/product-image-variants-edit.tsx

@@ -21,7 +21,11 @@ export const ProductImageVariantsEdit = () => {
 
   const { product, isPending } = useProduct(
     product_id!,
-    { fields: "images.id,images.url,images.variants.id" },
+    {
+      // TODO: Remove exclusion once we avoid including unnecessary relations by default in the query config
+      fields:
+        "images.id,images.url,images.variants.id,-type,-collection,-options,-tags,-variants,-sales_channels",
+    },
     {
       enabled: !!product_id && !!image_id,
     }

package/src/routes/products/product-media/product-media.tsx

@@ -8,7 +8,10 @@ export const ProductMedia = () => {
   const { t } = useTranslation()
   const { id } = useParams()
 
-  const { product, isLoading, isError, error } = useProduct(id!)
+  const { product, isLoading, isError, error } = useProduct(id!, {
+    // TODO: Remove exclusion once we avoid including unnecessary relations by default in the query config
+    fields: "-type,-collection,-options,-tags,-variants,-sales_channels",
+  })
 
   const ready = !isLoading && product
 

package/src/routes/products/product-metadata/product-metadata.tsx

@@ -5,7 +5,11 @@ import { useProduct, useUpdateProduct } from "../../../hooks/api"
 export const ProductMetadata = () => {
   const { id } = useParams()
 
-  const { product, isPending, isError, error } = useProduct(id!)
+  const { product, isPending, isError, error } = useProduct(id!, {
+    // TODO: Remove exclusion once we avoid including unnecessary relations by default in the query config
+    fields:
+      "-type,-collection,-options,-tags,-images,-variants,-sales_channels",
+  })
 
   const { mutateAsync, isPending: isMutating } = useUpdateProduct(product?.id!)
 

package/src/routes/products/product-organization/product-organization.tsx

@@ -4,7 +4,6 @@ import { useParams } from "react-router-dom"
 
 import { RouteDrawer } from "../../../components/modals"
 import { useProduct } from "../../../hooks/api/products"
-import { PRODUCT_DETAIL_FIELDS } from "../product-detail/constants"
 import { ProductOrganizationForm } from "./components/product-organization-form"
 
 export const ProductOrganization = () => {
@@ -12,7 +11,8 @@ export const ProductOrganization = () => {
   const { t } = useTranslation()
 
   const { product, isLoading, isError, error } = useProduct(id!, {
-    fields: PRODUCT_DETAIL_FIELDS,
+    // TODO: Remove exclusion once we avoid including unnecessary relations by default in the query config
+    fields: "*categories,-options,-images,-variants,-sales_channels",
   })
 
   if (isError) {

package/src/routes/products/product-prices/product-prices.tsx

@@ -7,7 +7,10 @@ import { PricingEdit } from "./pricing-edit"
 export const ProductPrices = () => {
   const { id, variant_id } = useParams()
 
-  const { product, isLoading, isError, error } = useProduct(id!)
+  const { product, isLoading, isError, error } = useProduct(id!, {
+    // TODO: Remove exclusion once we avoid including unnecessary relations by default in the query config
+    fields: "-type,-collection,-options,-tags,-images,-sales_channels",
+  })
 
   if (isError) {
     throw error

package/src/routes/products/product-sales-channels/product-sales-channels.tsx

@@ -6,7 +6,10 @@ import { EditSalesChannelsForm } from "./components/edit-sales-channels-form"
 
 export const ProductSalesChannels = () => {
   const { id } = useParams()
-  const { product, isLoading, isError, error } = useProduct(id!)
+  const { product, isLoading, isError, error } = useProduct(id!, {
+    // TODO: Remove exclusion once we avoid including unnecessary relations by default in the query config
+    fields: "-type,-collection,-options,-tags,-images,-variants",
+  })
 
   if (isError) {
     throw error

package/src/routes/products/product-shipping-profile/product-shipping-profile.tsx

@@ -4,7 +4,6 @@ import { useParams } from "react-router-dom"
 
 import { RouteDrawer } from "../../../components/modals"
 import { useProduct } from "../../../hooks/api/products"
-import { PRODUCT_DETAIL_FIELDS } from "../product-detail/constants"
 import { ProductShippingProfileForm } from "./components/product-organization-form"
 
 export const ProductShippingProfile = () => {
@@ -12,7 +11,9 @@ export const ProductShippingProfile = () => {
   const { t } = useTranslation()
 
   const { product, isLoading, isError, error } = useProduct(id!, {
-    fields: PRODUCT_DETAIL_FIELDS,
+    // TODO: Remove exclusion once we avoid including unnecessary relations by default in the query config
+    fields:
+      "*shipping_profile,-type,-collection,-options,-tags,-images,-variants,-sales_channels",
   })
 
   if (isError) {

package/src/routes/store/common/hooks/use-locales-table-columns.tsx

@@ -0,0 +1,29 @@
+import { HttpTypes } from "@medusajs/types"
+import { createColumnHelper } from "@tanstack/react-table"
+import { useMemo } from "react"
+import { useTranslation } from "react-i18next"
+
+import {
+  TextCell,
+  TextHeader,
+} from "../../../../components/table/table-cells/common/text-cell"
+
+const columnHelper = createColumnHelper<HttpTypes.AdminLocale>()
+
+export const useLocalesTableColumns = () => {
+  const { t } = useTranslation()
+
+  return useMemo(
+    () => [
+      columnHelper.accessor("code", {
+        header: () => <TextHeader text={t("fields.code")} />,
+        cell: ({ getValue }) => <TextCell text={getValue()} />,
+      }),
+      columnHelper.accessor("name", {
+        header: () => <TextHeader text={t("fields.name")} />,
+        cell: ({ getValue }) => <TextCell text={getValue()} />,
+      }),
+    ],
+    [t]
+  )
+}

package/src/routes/store/common/hooks/use-locales-table-query.tsx

@@ -0,0 +1,21 @@
+import { useQueryParams } from "../../../../hooks/use-query-params"
+
+export const useLocalesTableQuery = ({
+  pageSize = 10,
+  prefix,
+}: {
+  pageSize?: number
+  prefix?: string
+}) => {
+  const raw = useQueryParams(["order", "q", "offset"], prefix)
+
+  const { offset, ...rest } = raw
+
+  const searchParams = {
+    limit: pageSize,
+    offset: offset ? parseInt(offset) : 0,
+    ...rest,
+  }
+
+  return { searchParams, raw }
+}