@medusajs/dashboard 2.6.0-snapshot-20250221164338 → 3.0.0-preview-20250211091350

package/src/routes/orders/order-detail/components/order-summary-section/order-summary-section.tsx

@@ -1,6 +1,6 @@
 import { ReactNode, useMemo, useState } from "react"
 import { useTranslation } from "react-i18next"
-import { Link, useNavigate } from "react-router-dom"
+import { useNavigate } from "react-router-dom"
 
 import {
   ArrowDownRightMini,
@@ -18,9 +18,9 @@ import {
   AdminOrder,
   AdminOrderLineItem,
   AdminOrderPreview,
-  AdminPaymentCollection,
   AdminRegion,
   AdminReturn,
+  AdminPaymentCollection,
 } from "@medusajs/types"
 import {
   Badge,
@@ -188,12 +188,16 @@ export const OrderSummarySection = ({ order }: OrderSummarySectionProps) => {
         <div className="bg-ui-bg-subtle flex items-center justify-end gap-x-2 rounded-b-xl px-4 py-4">
           {showReturns &&
             (receivableReturns.length === 1 ? (
-              <Button asChild variant="secondary" size="small">
-                <Link
-                  to={`/orders/${order.id}/returns/${receivableReturns[0].id}/receive`}
-                >
-                  {t("orders.returns.receive.action")}
-                </Link>
+              <Button
+                onClick={() =>
+                  navigate(
+                    `/orders/${order.id}/returns/${receivableReturns[0].id}/receive`
+                  )
+                }
+                variant="secondary"
+                size="small"
+              >
+                {t("orders.returns.receive.action")}
               </Button>
             ) : (
               <ActionMenu
@@ -232,10 +236,11 @@ export const OrderSummarySection = ({ order }: OrderSummarySectionProps) => {
             ))}
 
           {showAllocateButton && (
-            <Button asChild variant="secondary" size="small">
-              <Link to="allocate-items">
-                {t("orders.allocateItems.action")}
-              </Link>
+            <Button
+              onClick={() => navigate(`./allocate-items`)}
+              variant="secondary"
+            >
+              {t("orders.allocateItems.action")}
             </Button>
           )}
 
@@ -257,15 +262,17 @@ export const OrderSummarySection = ({ order }: OrderSummarySectionProps) => {
           )}
 
           {showRefund && (
-            <Button size="small" variant="secondary" asChild>
-              <Link to={`/orders/${order.id}/refund`}>
-                {t("orders.payment.refundAmount", {
-                  amount: getStylizedAmount(
-                    pendingDifference * -1,
-                    order?.currency_code
-                  ),
-                })}
-              </Link>
+            <Button
+              size="small"
+              variant="secondary"
+              onClick={() => navigate(`/orders/${order.id}/refund`)}
+            >
+              {t("orders.payment.refundAmount", {
+                amount: getStylizedAmount(
+                  pendingDifference * -1,
+                  order?.currency_code
+                ),
+              })}
             </Button>
           )}
         </div>

package/src/routes/orders/order-detail/constants.ts

@@ -37,7 +37,6 @@ const DEFAULT_RELATIONS = [
   "*promotion",
   "*shipping_methods",
   "*fulfillments",
-  "+fulfillments.shipping_option.service_zone.fulfillment_set.type",
   "*fulfillments.items",
   "*fulfillments.labels",
   "*fulfillments.labels",

package/src/routes/products/product-create/components/product-create-details-form/components/product-create-details-variant-section/product-create-details-variant-section.tsx

@@ -6,7 +6,6 @@ import {
   Heading,
   Hint,
   IconButton,
-  InlineTip,
   Input,
   Label,
   Text,
@@ -22,6 +21,7 @@ import {
 import { useTranslation } from "react-i18next"
 
 import { Form } from "../../../../../../../components/common/form"
+import { InlineTip } from "../../../../../../../components/common/inline-tip"
 import { SortableList } from "../../../../../../../components/common/sortable-list"
 import { SwitchBox } from "../../../../../../../components/common/switch-box"
 import { ChipInput } from "../../../../../../../components/inputs/chip-input"
@@ -522,7 +522,7 @@ export const ProductCreateVariantsSection = ({
                 </Alert>
               )}
               {variants.fields.length > 0 && (
-                <InlineTip label={t("general.tip")}>
+                <InlineTip variant="tip">
                   {t("products.create.variants.productVariants.tip")}
                 </InlineTip>
               )}

package/src/routes/products/product-create/components/product-create-form/product-create-form.tsx

@@ -181,6 +181,15 @@ export const ProductCreateForm = ({
     }
 
     if (currentTab === Tab.ORGANIZE) {
+      // TODO: this is temp until we add partial validation per tab
+      if (!form.getValues("shipping_profile_id")) {
+        form.setError("shipping_profile_id", {
+          type: "required",
+          message: t("products.shippingProfile.create.errors.required"),
+        })
+        return
+      }
+
       setTab(Tab.VARIANTS)
     }
 
@@ -220,13 +229,6 @@ export const ProductCreateForm = ({
         onKeyDown={(e) => {
           // We want to continue to the next tab on enter instead of saving as draft immediately
           if (e.key === "Enter") {
-            if (
-              e.target instanceof HTMLTextAreaElement &&
-              !(e.metaKey || e.ctrlKey)
-            ) {
-              return
-            }
-
             e.preventDefault()
 
             if (e.metaKey || e.ctrlKey) {

package/src/routes/products/product-create/components/product-create-organize-form/components/product-create-organize-section/product-create-details-organize-section.tsx

@@ -173,9 +173,7 @@ export const ProductCreateOrganizationSection = ({
       </div>
       <div className="grid grid-cols-1 gap-4 md:grid-cols-2">
         <div>
-          <Form.Label optional>
-            {t("products.fields.shipping_profile.label")}
-          </Form.Label>
+          <Form.Label>{t("products.fields.shipping_profile.label")}</Form.Label>
           <Form.Hint>
             <Trans i18nKey={"products.fields.shipping_profile.hint"} />
           </Form.Hint>

package/src/routes/products/product-create/constants.ts

@@ -1,7 +1,7 @@
 import { z } from "zod"
-import { i18n } from "../../../components/utilities/i18n/i18n"
-import { optionalFloat, optionalInt } from "../../../lib/validation"
-import { decorateVariantsWithDefaultValues } from "./utils"
+import { i18n } from "../../../components/utilities/i18n/i18n.tsx"
+import { optionalFloat, optionalInt } from "../../../lib/validation.ts"
+import { decorateVariantsWithDefaultValues } from "./utils.ts"
 
 export const MediaSchema = z.object({
   id: z.string().optional(),
@@ -64,7 +64,7 @@ export const ProductCreateSchema = z
     discountable: z.boolean(),
     type_id: z.string().optional(),
     collection_id: z.string().optional(),
-    shipping_profile_id: z.string().optional(),
+    shipping_profile_id: z.string(), // TODO: require min(1) when partial validation per tab is added
     categories: z.array(z.string()),
     tags: z.array(z.string()).optional(),
     sales_channels: z

package/src/routes/products/product-create/utils.ts

@@ -24,7 +24,7 @@ export const normalizeProductFormValues = (
       : undefined,
     images,
     collection_id: values.collection_id || undefined,
-    shipping_profile_id: values.shipping_profile_id || undefined,
+    shipping_profile_id: values.shipping_profile_id,
     categories: values.categories.map((id) => ({ id })),
     type_id: values.type_id || undefined,
     handle: values.handle || undefined,

package/src/routes/products/product-detail/components/product-variant-section/product-variant-section.tsx

@@ -75,8 +75,7 @@ export const ProductVariantSection = ({
         : undefined,
       created_at: created_at ? JSON.parse(created_at) : undefined,
       updated_at: updated_at ? JSON.parse(updated_at) : undefined,
-      fields:
-        "title,sku,*options,created_at,updated_at,*inventory_items.inventory.location_levels,inventory_quantity",
+      fields: "*inventory_items.inventory.location_levels,+inventory_quantity",
     },
     {
       placeholderData: keepPreviousData,

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

@@ -7,7 +7,9 @@ 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!, {
+    fields: "+variants,+variants.prices",
+  })
 
   if (isError) {
     throw error

package/src/routes/products/product-shipping-profile/components/product-organization-form/product-shipping-profile-form.tsx

@@ -7,13 +7,12 @@ import { Form } from "../../../../../components/common/form"
 import { Combobox } from "../../../../../components/inputs/combobox"
 import { RouteDrawer, useRouteModal } from "../../../../../components/modals"
 import { KeyboundForm } from "../../../../../components/utilities/keybound-form"
+import { useExtendableForm } from "../../../../../extensions"
 import { useUpdateProduct } from "../../../../../hooks/api/products"
 import { useComboboxData } from "../../../../../hooks/use-combobox-data"
 import { sdk } from "../../../../../lib/client"
 import { useForm } from "react-hook-form"
 import { zodResolver } from "@hookform/resolvers/zod"
-import { se } from "date-fns/locale"
-import { useEffect } from "react"
 
 type ProductShippingProfileFormProps = {
   product: HttpTypes.AdminProduct & {
@@ -48,15 +47,12 @@ export const ProductShippingProfileForm = ({
     resolver: zodResolver(ProductShippingProfileSchema),
   })
 
-  const selectedShippingProfile = form.watch("shipping_profile_id")
-
   const { mutateAsync, isPending } = useUpdateProduct(product.id)
 
   const handleSubmit = form.handleSubmit(async (data) => {
     await mutateAsync(
       {
-        shipping_profile_id:
-          data.shipping_profile_id === "" ? null : data.shipping_profile_id,
+        shipping_profile_id: data.shipping_profile_id,
       },
       {
         onSuccess: ({ product }) => {
@@ -74,12 +70,6 @@ export const ProductShippingProfileForm = ({
     )
   })
 
-  useEffect(() => {
-    if (typeof selectedShippingProfile === "undefined") {
-      form.setValue("shipping_profile_id", "")
-    }
-  }, [selectedShippingProfile])
-
   return (
     <RouteDrawer.Form form={form}>
       <KeyboundForm onSubmit={handleSubmit} className="flex h-full flex-col">
@@ -97,7 +87,6 @@ export const ProductShippingProfileForm = ({
                     <Form.Control>
                       <Combobox
                         {...field}
-                        allowClear
                         options={shippingProfiles.options}
                         searchValue={shippingProfiles.searchValue}
                         onSearchValueChange={

package/dist/{chunk-EGUG76J6.mjs → chunk-N6PBCMOV.mjs}

@@ -1,11 +1,11 @@
+import {
+  GEO_ZONE_STACKED_MODAL_ID
+} from "./chunk-PYIO3TDQ.mjs";
 import {
   useCountries,
   useCountryTableColumns,
   useCountryTableQuery
 } from "./chunk-NOAFLTPV.mjs";
-import {
-  GEO_ZONE_STACKED_MODAL_ID
-} from "./chunk-PYIO3TDQ.mjs";
 import {
   _DataTable,
   useDataTable