@medusajs/dashboard 3.0.0-snapshot-20251208164410 → 3.0.0-snapshot-20251211173847

package/src/routes/orders/order-export/order-export.tsx

@@ -0,0 +1,66 @@
+import { Button, Heading, toast } from "@medusajs/ui"
+import { useTranslation } from "react-i18next"
+import { RouteDrawer, useRouteModal } from "../../../components/modals"
+import { useExportOrders } from "../../../hooks/api"
+import { useOrderTableQuery } from "../../../hooks/table/query"
+import { ExportFilters } from "./components/export-filters"
+
+export const OrderExport = () => {
+  const { t } = useTranslation()
+
+  return (
+    <RouteDrawer>
+      <RouteDrawer.Header>
+        <RouteDrawer.Title asChild>
+          <Heading>{t("orders.export.header")}</Heading>
+        </RouteDrawer.Title>
+        <RouteDrawer.Description className="sr-only">
+          {t("orders.export.description")}
+        </RouteDrawer.Description>
+      </RouteDrawer.Header>
+      <OrderExportContent />
+    </RouteDrawer>
+  )
+}
+
+const OrderExportContent = () => {
+  const { t } = useTranslation()
+  const { searchParams } = useOrderTableQuery({})
+
+  const { mutateAsync } = useExportOrders(searchParams)
+  const { handleSuccess } = useRouteModal()
+
+  const handleExportRequest = async () => {
+    await mutateAsync(searchParams, {
+      onSuccess: () => {
+        toast.info(t("orders.export.success.title"), {
+          description: t("orders.export.success.description"),
+        })
+        handleSuccess()
+      },
+      onError: (err) => {
+        toast.error(err.message)
+      },
+    })
+  }
+
+  return (
+    <>
+      <RouteDrawer.Body>
+        <ExportFilters />
+      </RouteDrawer.Body>
+      <RouteDrawer.Footer>
+        <div className="flex items-center gap-x-2">
+          <RouteDrawer.Close asChild>
+            <Button size="small" variant="secondary">
+              {t("actions.cancel")}
+            </Button>
+          </RouteDrawer.Close>
+          <Button onClick={handleExportRequest} size="small">
+            {t("actions.export")}
+          </Button>
+        </div>
+      </RouteDrawer.Footer>
+    </>
+  )
+}

package/src/routes/orders/order-list/components/order-list-table/configurable-order-list-table.tsx

@@ -1,16 +1,26 @@
 import { useTranslation } from "react-i18next"
+import { useLocation } from "react-router-dom"
 import { ConfigurableDataTable } from "../../../../../components/table/configurable-data-table"
 import { useOrderTableAdapter } from "./order-table-adapter"
 
 export const ConfigurableOrderListTable = () => {
   const { t } = useTranslation()
+  const location = useLocation()
   const orderAdapter = useOrderTableAdapter()
 
+  const actions = [
+    {
+      label: t("actions.export"),
+      to: `export${location.search}`,
+    },
+  ]
+
   return (
     <ConfigurableDataTable
       adapter={orderAdapter}
       heading={t("orders.domain")}
       layout="fill"
+      actions={actions}
     />
   )
 }

package/src/routes/orders/order-list/components/order-list-table/order-list-table.tsx

@@ -1,15 +1,16 @@
-import { Container, Heading } from "@medusajs/ui"
+import { Button, Container, Heading } from "@medusajs/ui"
 import { keepPreviousData } from "@tanstack/react-query"
 import { useTranslation } from "react-i18next"
+import { Link, Outlet, useLocation } from "react-router-dom"
 
 import { _DataTable } from "../../../../../components/table/data-table/data-table"
 import { useOrders } from "../../../../../hooks/api/orders"
 import { useOrderTableColumns } from "../../../../../hooks/table/columns/use-order-table-columns"
-import { useOrderTableFilters } from "./use-order-table-filters"
 import { useOrderTableQuery } from "../../../../../hooks/table/query/use-order-table-query"
 import { useDataTable } from "../../../../../hooks/use-data-table"
 import { useFeatureFlag } from "../../../../../providers/feature-flag-provider"
 import { ConfigurableOrderListTable } from "./configurable-order-list-table"
+import { useOrderTableFilters } from "./use-order-table-filters"
 
 import { DEFAULT_FIELDS } from "../../const"
 
@@ -17,6 +18,7 @@ const PAGE_SIZE = 20
 
 export const OrderListTable = () => {
   const { t } = useTranslation()
+  const location = useLocation()
   const isViewConfigEnabled = useFeatureFlag("view_configurations")
 
   // If feature flag is enabled, use the new configurable table
@@ -57,6 +59,9 @@ export const OrderListTable = () => {
     <Container className="divide-y p-0">
       <div className="flex items-center justify-between px-6 py-4">
         <Heading>{t("orders.domain")}</Heading>
+        <Button size="small" variant="secondary" asChild>
+          <Link to={`export${location.search}`}>{t("actions.export")}</Link>
+        </Button>
       </div>
       <_DataTable
         columns={columns}
@@ -78,6 +83,7 @@ export const OrderListTable = () => {
           message: t("orders.list.noRecordsMessage"),
         }}
       />
+      <Outlet />
     </Container>
   )
 }

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/components/product-create-details-form/components/product-create-details-general-section/product-create-general-section.tsx

@@ -27,10 +27,7 @@ export const ProductCreateGeneralSection = ({
                 <Form.Item>
                   <Form.Label>{t("products.fields.title.label")}</Form.Label>
                   <Form.Control>
-                    <Input
-                      {...field}
-                      placeholder={t("products.fields.title.placeholder")}
-                    />
+                    <Input {...field} placeholder={t("products.fields.title.placeholder")} />
                   </Form.Control>
                 </Form.Item>
               )
@@ -46,10 +43,7 @@ export const ProductCreateGeneralSection = ({
                     {t("products.fields.subtitle.label")}
                   </Form.Label>
                   <Form.Control>
-                    <Input
-                      {...field}
-                      placeholder={t("products.fields.subtitle.placeholder")}
-                    />
+                    <Input {...field} placeholder={t("products.fields.subtitle.placeholder")} />
                   </Form.Control>
                 </Form.Item>
               )
@@ -68,10 +62,7 @@ export const ProductCreateGeneralSection = ({
                     {t("fields.handle")}
                   </Form.Label>
                   <Form.Control>
-                    <HandleInput
-                      {...field}
-                      placeholder={t("products.fields.handle.placeholder")}
-                    />
+                    <HandleInput {...field} placeholder={t("products.fields.handle.placeholder")} />
                   </Form.Control>
                 </Form.Item>
               )
@@ -89,10 +80,7 @@ export const ProductCreateGeneralSection = ({
                 {t("products.fields.description.label")}
               </Form.Label>
               <Form.Control>
-                <Textarea
-                  {...field}
-                  placeholder={t("products.fields.description.placeholder")}
-                />
+                <Textarea {...field} placeholder={t("products.fields.description.placeholder")} />
               </Form.Control>
             </Form.Item>
           )