@medusajs/dashboard 2.12.2 → 2.12.3-preview-20251217000306

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

@@ -180,6 +180,7 @@ function OrderEditItem({ item, currencyCode, orderId }: OrderEditItemProps) {
             <Input
               className="bg-ui-bg-base txt-small w-[67px] rounded-lg [appearance:textfield] [&::-webkit-inner-spin-button]:appearance-none [&::-webkit-outer-spin-button]:appearance-none"
               type="number"
+              step="any"
               disabled={item.detail.fulfilled_quantity === item.quantity}
               min={item.detail.fulfilled_quantity}
               defaultValue={item.quantity}

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

@@ -0,0 +1,22 @@
+import { Heading, Text } from "@medusajs/ui"
+import { useTranslation } from "react-i18next"
+import { DataTableFilter } from "../../../../components/table/data-table/data-table-filter"
+import { useOrderTableFilters } from "../../order-list/components/order-list-table/use-order-table-filters"
+
+export const ExportFilters = () => {
+  const { t } = useTranslation()
+  const filters = useOrderTableFilters()
+
+  return (
+    <div>
+      <Heading level="h2">{t("orders.export.filters.title")}</Heading>
+      <Text size="small" className="text-ui-fg-subtle">
+        {t("orders.export.filters.description")}
+      </Text>
+
+      <div className="mt-4">
+        <DataTableFilter filters={filters} readonly />
+      </div>
+    </div>
+  )
+}

package/src/routes/orders/order-export/index.ts

@@ -0,0 +1 @@
+export { OrderExport as Component } from "./order-export"

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,24 @@
 import { useTranslation } from "react-i18next"
+import { Outlet, 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 orderAdapter = useOrderTableAdapter()
+  const location = useLocation()
+  const adapter = useOrderTableAdapter()
 
   return (
-    <ConfigurableDataTable
-      adapter={orderAdapter}
-      heading={t("orders.domain")}
-      layout="fill"
-    />
+    <>
+      <ConfigurableDataTable
+        adapter={adapter}
+        heading={t("orders.domain")}
+        actions={[
+          { label: t("actions.export"), to: `export${location.search}` },
+        ]}
+      />
+      <Outlet />
+    </>
   )
 }

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/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/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 {

package/src/routes/store/store-add-locales/components/add-locales-form/add-locales-form.tsx

@@ -100,19 +100,10 @@ export const AddLocalesForm = ({ store }: AddLocalesFormProps) => {
       new Set([...data.locales, ...preSelectedRows])
     ) as string[]
 
-    let defaultLocale = store.supported_locales?.find(
-      (l) => l.is_default
-    )?.locale_code
-
-    if (!locales.includes(defaultLocale ?? "")) {
-      defaultLocale = locales?.[0]
-    }
-
     await mutateAsync(
       {
         supported_locales: locales.map((l) => ({
           locale_code: l,
-          is_default: l === defaultLocale,
         })),
       },
       {

package/src/routes/store/store-detail/components/store-general-section/store-general-section.tsx

@@ -7,7 +7,6 @@ import { Link } from "react-router-dom"
 import { ActionMenu } from "../../../../../components/common/action-menu"
 import { useSalesChannel, useStockLocation } from "../../../../../hooks/api"
 import { useRegion } from "../../../../../hooks/api/regions"
-import { useFeatureFlag } from "../../../../../providers/feature-flag-provider"
 
 type StoreGeneralSectionProps = {
   store: AdminStore
@@ -15,14 +14,12 @@ type StoreGeneralSectionProps = {
 
 export const StoreGeneralSection = ({ store }: StoreGeneralSectionProps) => {
   const { t } = useTranslation()
-  const isTranslationsEnabled = useFeatureFlag("translation")
 
   const { region } = useRegion(store.default_region_id!, undefined, {
     enabled: !!store.default_region_id,
   })
 
   const defaultCurrency = store.supported_currencies?.find((c) => c.is_default)
-  const defaultLocale = store.supported_locales?.find((l) => l.is_default)
 
   const { sales_channel } = useSalesChannel(store.default_sales_channel_id!, {
     enabled: !!store.default_sales_channel_id,
@@ -88,27 +85,6 @@ export const StoreGeneralSection = ({ store }: StoreGeneralSectionProps) => {
           </Text>
         )}
       </div>
-      {isTranslationsEnabled && (
-        <div className="text-ui-fg-subtle grid grid-cols-2 px-6 py-4">
-          <Text size="small" leading="compact" weight="plus">
-            {t("store.defaultLocale")}
-          </Text>
-          {defaultLocale ? (
-            <div className="flex items-center gap-x-2">
-              <Badge size="2xsmall">
-                {defaultLocale.locale_code?.toUpperCase()}
-              </Badge>
-              <Text size="small" leading="compact">
-                {defaultLocale.locale?.name}
-              </Text>
-            </div>
-          ) : (
-            <Text size="small" leading="compact">
-              -
-            </Text>
-          )}
-        </div>
-      )}
       <div className="text-ui-fg-subtle grid grid-cols-2 px-6 py-4">
         <Text size="small" leading="compact" weight="plus">
           {t("store.defaultRegion")}

package/src/routes/store/store-detail/components/store-locale-section/store-locale-section.tsx

@@ -60,8 +60,6 @@ export const StoreLocaleSection = ({ store }: StoreLocaleSectionProps) => {
     meta: {
       storeId: store.id,
       supportedLocales: store.supported_locales,
-      defaultLocaleCode: store.supported_locales?.find((l) => l.is_default)
-        ?.locale_code,
     },
   })
 
@@ -165,12 +163,10 @@ const LocaleActions = ({
   storeId,
   locale,
   supportedLocales,
-  defaultLocaleCode,
 }: {
   storeId: string
   locale: HttpTypes.AdminLocale
   supportedLocales: HttpTypes.AdminStoreLocale[]
-  defaultLocaleCode: string
 }) => {
   const { mutateAsync } = useUpdateStore(storeId)
   const { t } = useTranslation()
@@ -218,7 +214,6 @@ const LocaleActions = ({
               icon: <Trash />,
               label: t("actions.remove"),
               onClick: handleRemove,
-              disabled: locale.code === defaultLocaleCode,
             },
           ],
         },
@@ -267,9 +262,7 @@ const useColumns = () => {
       columnHelper.display({
         id: "actions",
         cell: ({ row, table }) => {
-          const { supportedLocales, storeId, defaultLocaleCode } = table.options
-            .meta as {
-            defaultLocaleCode: string
+          const { supportedLocales, storeId } = table.options.meta as {
             supportedLocales: HttpTypes.AdminStoreLocale[]
             storeId: string
           }
@@ -279,7 +272,6 @@ const useColumns = () => {
               storeId={storeId}
               locale={row.original}
               supportedLocales={supportedLocales}
-              defaultLocaleCode={defaultLocaleCode}
             />
           )
         },

package/src/routes/store/store-edit/components/edit-store-form/edit-store-form.tsx

@@ -13,7 +13,6 @@ import { useUpdateStore } from "../../../../../hooks/api/store"
 import { useComboboxData } from "../../../../../hooks/use-combobox-data"
 import { sdk } from "../../../../../lib/client"
 import { useDocumentDirection } from "../../../../../hooks/use-document-direction"
-import { useFeatureFlag } from "../../../../../providers/feature-flag-provider"
 
 type EditStoreFormProps = {
   store: HttpTypes.AdminStore
@@ -22,7 +21,6 @@ type EditStoreFormProps = {
 const EditStoreSchema = z.object({
   name: z.string().min(1),
   default_currency_code: z.string().optional(),
-  default_locale_code: z.string().optional(),
   default_region_id: z.string().optional(),
   default_sales_channel_id: z.string().optional(),
   default_location_id: z.string().optional(),
@@ -30,16 +28,12 @@ const EditStoreSchema = z.object({
 
 export const EditStoreForm = ({ store }: EditStoreFormProps) => {
   const { t } = useTranslation()
-  const isTranslationsEnabled = useFeatureFlag("translation")
   const { handleSuccess } = useRouteModal()
   const direction = useDocumentDirection()
   const form = useForm<z.infer<typeof EditStoreSchema>>({
     defaultValues: {
       name: store.name,
       default_region_id: store.default_region_id || undefined,
-      default_locale_code:
-        store.supported_locales?.find((l) => l.is_default)?.locale_code ||
-        undefined,
       default_currency_code:
         store.supported_currencies?.find((c) => c.is_default)?.currency_code ||
         undefined,
@@ -79,14 +73,10 @@ export const EditStoreForm = ({ store }: EditStoreFormProps) => {
   })
 
   const handleSubmit = form.handleSubmit(async (values) => {
-    const { default_currency_code, default_locale_code, ...rest } = values
+    const { default_currency_code, ...rest } = values
 
     const normalizedMutation: HttpTypes.AdminUpdateStore = {
       ...rest,
-      supported_locales: store.supported_locales?.map((l) => ({
-        ...l,
-        is_default: l.locale_code === default_locale_code,
-      })),
       supported_currencies: store.supported_currencies?.map((c) => ({
         ...c,
         is_default: c.currency_code === default_currency_code,
@@ -156,40 +146,6 @@ export const EditStoreForm = ({ store }: EditStoreFormProps) => {
                 )
               }}
             />
-            {isTranslationsEnabled && (
-              <Form.Field
-                control={form.control}
-                name="default_locale_code"
-                render={({ field: { onChange, ...field } }) => {
-                  return (
-                    <Form.Item>
-                      <Form.Label>{t("store.defaultLocale")}</Form.Label>
-                      <Form.Control>
-                        <Select
-                          dir={direction}
-                          {...field}
-                          onValueChange={onChange}
-                        >
-                          <Select.Trigger ref={field.ref}>
-                            <Select.Value />
-                          </Select.Trigger>
-                          <Select.Content>
-                            {store.supported_locales?.map((locale) => (
-                              <Select.Item
-                                key={locale.locale_code}
-                                value={locale.locale_code}
-                              >
-                                {locale.locale_code}
-                              </Select.Item>
-                            ))}
-                          </Select.Content>
-                        </Select>
-                      </Form.Control>
-                    </Form.Item>
-                  )
-                }}
-              />
-            )}
             <Form.Field
               control={form.control}
               name="default_region_id"

package/dist/{location-service-zone-shipping-option-edit-QS6HTWST.mjs → location-service-zone-shipping-option-edit-M2HJAASG.mjs}

@@ -1,12 +1,12 @@
+import {
+  isOptionEnabledInStore
+} from "./chunk-UC26CCHZ.mjs";
 import {
   ShippingOptionPriceType
 } from "./chunk-PYIO3TDQ.mjs";
 import {
   formatProvider
 } from "./chunk-IR5DHEKS.mjs";
-import {
-  isOptionEnabledInStore
-} from "./chunk-UC26CCHZ.mjs";
 import {
   useComboboxData
 } from "./chunk-3TZOFKX2.mjs";