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

package/src/components/common/inline-tip/inline-tip.tsx

@@ -0,0 +1,60 @@
+import { clx } from "@medusajs/ui"
+import { ComponentPropsWithoutRef, forwardRef } from "react"
+import { useTranslation } from "react-i18next"
+
+interface InlineTipProps extends ComponentPropsWithoutRef<"div"> {
+  /**
+   * The label to display in the tip.
+   */
+  label?: string
+  /**
+   * The variant of the tip.
+   */
+  variant?: "tip" | "warning"
+}
+
+/**
+ * A component for rendering inline tips. Useful for providing additional information or context.
+ *
+ * @example
+ * ```tsx
+ * <InlineTip label="Info">
+ *  This is an info tip.
+ * </InlineTip>
+ * ```
+ *
+ * TODO: Move to `@medusajs/ui` package.
+ */
+export const InlineTip = forwardRef<HTMLDivElement, InlineTipProps>(
+  ({ variant = "tip", label, className, children, ...props }, ref) => {
+    const { t } = useTranslation()
+    const labelValue =
+      label || (variant === "warning" ? t("general.warning") : t("general.tip"))
+
+    return (
+      <div
+        ref={ref}
+        className={clx(
+          "bg-ui-bg-component txt-small text-ui-fg-subtle grid grid-cols-[4px_1fr] items-start gap-3 rounded-lg border p-3",
+          className
+        )}
+        {...props}
+      >
+        <div
+          role="presentation"
+          className={clx("w-4px bg-ui-tag-neutral-icon h-full rounded-full", {
+            "bg-ui-tag-orange-icon": variant === "warning",
+          })}
+        />
+        <div className="text-pretty">
+          <strong className="txt-small-plus text-ui-fg-base">
+            {labelValue}:
+          </strong>{" "}
+          {children}
+        </div>
+      </div>
+    )
+  }
+)
+
+InlineTip.displayName = "InlineTip"

package/src/components/forms/metadata-form/metadata-form.tsx

@@ -4,7 +4,6 @@ import {
   DropdownMenu,
   Heading,
   IconButton,
-  InlineTip,
   clx,
   toast,
 } from "@medusajs/ui"
@@ -22,6 +21,7 @@ import { FetchError } from "@medusajs/js-sdk"
 import { ComponentPropsWithoutRef, forwardRef } from "react"
 import { ConditionalTooltip } from "../../common/conditional-tooltip"
 import { Form } from "../../common/form"
+import { InlineTip } from "../../common/inline-tip"
 import { Skeleton } from "../../common/skeleton"
 import { RouteDrawer, useRouteModal } from "../../modals"
 import { KeyboundForm } from "../../utilities/keybound-form"
@@ -88,7 +88,7 @@ const InnerForm = <TRes,>({
   })
 
   const handleSubmit = form.handleSubmit(async (data) => {
-    const parsedData = parseValues(data, metadata)
+    const parsedData = parseValues(data)
 
     await hook(
       {
@@ -364,8 +364,7 @@ function getDefaultValues(
 }
 
 function parseValues(
-  values: z.infer<typeof MetadataSchema>,
-  original?: Record<string, any> | null
+  values: z.infer<typeof MetadataSchema>
 ): Record<string, any> | null {
   const metadata = values.metadata
 
@@ -379,22 +378,12 @@ function parseValues(
 
   const update: Record<string, any> = {}
 
-  // First, handle removed keys from original
-  if (original) {
-    Object.keys(original).forEach((originalKey) => {
-      const exists = metadata.some((field) => field.key === originalKey)
-      if (!exists) {
-        update[originalKey] = ""
-      }
-    })
-  }
-
   metadata.forEach((field) => {
     let key = field.key
     let value = field.value
     const disabled = field.disabled
 
-    if (!key) {
+    if (!key || !value) {
       return
     }
 
@@ -404,7 +393,7 @@ function parseValues(
     }
 
     key = key.trim()
-    value = value?.trim() ?? ""
+    value = value.trim()
 
     // We try to cast the value to a boolean or number if possible
     if (value === "true") {
@@ -412,9 +401,9 @@ function parseValues(
     } else if (value === "false") {
       update[key] = false
     } else {
-      const isNumeric = /^-?\d*\.?\d+$/.test(value)
-      if (isNumeric) {
-        update[key] = parseFloat(value)
+      const parsedNumber = parseFloat(value)
+      if (!isNaN(parsedNumber)) {
+        update[key] = parsedNumber
       } else {
         update[key] = value
       }

package/src/components/inputs/combobox/combobox.tsx

@@ -57,7 +57,6 @@ interface ComboboxProps<T extends Value = Value>
   isFetchingNextPage?: boolean
   onCreateOption?: (value: string) => void
   noResultsPlaceholder?: ReactNode
-  allowClear?: boolean
 }
 
 const ComboboxImpl = <T extends Value = string>(
@@ -73,7 +72,6 @@ const ComboboxImpl = <T extends Value = string>(
     isFetchingNextPage,
     onCreateOption,
     noResultsPlaceholder,
-    allowClear,
     ...inputProps
   }: ComboboxProps<T>,
   ref: ForwardedRef<HTMLInputElement>
@@ -305,18 +303,6 @@ const ComboboxImpl = <T extends Value = string>(
             {...inputProps}
           />
         </div>
-        {allowClear && controlledValue && (
-          <button
-            type="button"
-            onClick={(e) => {
-              e.preventDefault()
-              handleValueChange(undefined)
-            }}
-            className="bg-ui-bg-base hover:bg-ui-bg-base-hover txt-compact-small-plus text-ui-fg-subtle focus-within:border-ui-fg-interactive transition-fg absolute right-[28px] top-0.5 z-[1] flex h-[28px] items-center rounded-[4px] border px-1.5 py-[2px] outline-none"
-          >
-            <XMarkMini className="text-ui-fg-muted" />
-          </button>
-        )}
         <PrimitiveComboboxDisclosure
           render={(props) => {
             return (

package/src/extensions/forms/form-extension-zone/form-extension-zone.tsx

@@ -1,8 +1,8 @@
-import { InlineTip, Input, Switch } from "@medusajs/ui"
+import { Input, Switch } from "@medusajs/ui"
 import { ComponentType } from "react"
 import { ControllerRenderProps, UseFormReturn } from "react-hook-form"
-import { useTranslation } from "react-i18next"
 import { Form } from "../../../components/common/form"
+import { InlineTip } from "../../../components/common/inline-tip"
 import { FormField } from "../../types"
 import { FormFieldType } from "./types"
 import { getFieldType } from "./utils"
@@ -86,8 +86,6 @@ const FormExtensionFieldComponent = ({
   component,
   placeholder,
 }: FormExtensionFieldComponentProps) => {
-  const { t } = useTranslation()
-
   if (component) {
     const Component = component
 
@@ -106,7 +104,7 @@ const FormExtensionFieldComponent = ({
     }
     default: {
       return (
-        <InlineTip variant="warning" label={t("general.warning")}>
+        <InlineTip variant="warning">
           The field type does not support rendering a fallback component. Please
           provide a component prop.
         </InlineTip>

package/src/extensions/routes/utils.ts

@@ -1,5 +1,5 @@
 import { ComponentType } from "react"
-import { LoaderFunction, RouteObject } from "react-router-dom"
+import { RouteObject } from "react-router-dom"
 import { ErrorBoundary } from "../../components/utilities/error-boundary"
 import { RouteExtension, RouteModule } from "../types"
 
@@ -21,176 +21,50 @@ export const getRouteExtensions = (
   })
 }
 
-/**
- * Creates a route object for a branch node in the route tree
- * @param segment - The path segment for this branch
- */
-const createBranchRoute = (segment: string): RouteObject => ({
-  path: segment,
-  children: [],
-})
-
-/**
- * Creates a route object for a leaf node with its component
- * @param Component - The React component to render at this route
- */
-const createLeafRoute = (
-  Component: ComponentType,
-  loader?: LoaderFunction,
-  handle?: object
-): RouteObject => ({
-  path: "",
-  ErrorBoundary: ErrorBoundary,
-  async lazy() {
-    const result: {
-      Component: ComponentType
-      loader?: LoaderFunction
-      handle?: object
-    } = { Component }
-
-    if (loader) {
-      result.loader = loader
-    }
+export const createRouteMap = (
+  routes: RouteExtension[],
+  ignore?: string
+): RouteObject[] => {
+  const root: RouteObject[] = []
 
-    if (handle) {
-      result.handle = handle
+  const addRoute = (
+    pathSegments: string[],
+    Component: ComponentType,
+    currentLevel: RouteObject[]
+  ) => {
+    if (!pathSegments.length) {
+      return
     }
 
-    return result
-  },
-})
-
-/**
- * Creates a parallel route configuration
- * @param path - The route path
- * @param Component - The React component to render
- */
-const createParallelRoute = (
-  path: string,
-  Component: ComponentType,
-  loader?: LoaderFunction,
-  handle?: object
-) => ({
-  path,
-  async lazy() {
-    const result: {
-      Component: ComponentType
-      loader?: LoaderFunction
-      handle?: object
-    } = { Component }
-
-    if (loader) {
-      result.loader = loader
-    }
+    const [currentSegment, ...remainingSegments] = pathSegments
+    let route = currentLevel.find((r) => r.path === currentSegment)
 
-    if (handle) {
-      result.handle = handle
+    if (!route) {
+      route = { path: currentSegment, children: [] }
+      currentLevel.push(route)
     }
 
-    return result
-  },
-})
-
-/**
- * Processes parallel routes by cleaning their paths relative to the current path
- * @param parallelRoutes - Array of parallel route extensions
- * @param currentFullPath - The full path of the current route
- */
-const processParallelRoutes = (
-  parallelRoutes: RouteExtension[] | undefined,
-  currentFullPath: string
-): RouteObject[] | undefined => {
-  return parallelRoutes
-    ?.map(({ path, Component, loader, handle }) => {
-      const childPath = path?.replace(currentFullPath, "").replace(/^\/+/, "")
-      if (!childPath) {
-        return null
-      }
-      return createParallelRoute(childPath, Component, loader, handle)
-    })
-    .filter(Boolean) as RouteObject[]
-}
-
-/**
- * Recursively builds the route tree by adding routes at the correct level
- * @param pathSegments - Array of remaining path segments to process
- * @param Component - The React component for the route
- * @param currentLevel - Current level in the route tree
- * @param parallelRoutes - Optional parallel routes to add
- * @param fullPath - The full path up to the current level
- */
-const addRoute = (
-  pathSegments: string[],
-  Component: ComponentType,
-  currentLevel: RouteObject[],
-  loader?: LoaderFunction,
-  handle?: object,
-  parallelRoutes?: RouteExtension[],
-  fullPath?: string
-) => {
-  if (!pathSegments.length) {
-    return
-  }
-
-  const [currentSegment, ...remainingSegments] = pathSegments
-  let route = currentLevel.find((r) => r.path === currentSegment)
-
-  if (!route) {
-    route = createBranchRoute(currentSegment)
-    currentLevel.push(route)
-  }
-
-  const currentFullPath = fullPath
-    ? `${fullPath}/${currentSegment}`
-    : currentSegment
-
-  if (remainingSegments.length === 0) {
-    route.children ||= []
-    const leaf = createLeafRoute(Component, loader)
-
-    /**
-     * The handle needs to be set on the wrapper route object,
-     * in order for it to be resolved correctly thoughout
-     * the branch.
-     */
-    if (handle) {
-      route.handle = handle
+    if (remainingSegments.length === 0) {
+      route.children ||= []
+      route.children.push({
+        path: "",
+        ErrorBoundary: ErrorBoundary,
+        async lazy() {
+          return { Component }
+        },
+      })
+    } else {
+      route.children ||= []
+      addRoute(remainingSegments, Component, route.children)
     }
-
-    leaf.children = processParallelRoutes(parallelRoutes, currentFullPath)
-    route.children.push(leaf)
-  } else {
-    route.children ||= []
-    addRoute(
-      remainingSegments,
-      Component,
-      route.children,
-      loader,
-      handle,
-      parallelRoutes,
-      currentFullPath
-    )
   }
-}
-
-/**
- * Creates a complete route map from route extensions
- * @param routes - Array of route extensions to process
- * @param ignore - Optional path prefix to ignore when processing routes
- * @returns An array of route objects forming a route tree
- */
-export const createRouteMap = (
-  routes: RouteExtension[],
-  ignore?: string
-): RouteObject[] => {
-  const root: RouteObject[] = []
 
-  routes.forEach(({ path, Component, loader, handle, children }) => {
+  routes.forEach(({ path, Component }) => {
     const cleanedPath = ignore
       ? path.replace(ignore, "").replace(/^\/+/, "")
       : path.replace(/^\/+/, "")
     const pathSegments = cleanedPath.split("/").filter(Boolean)
-    addRoute(pathSegments, Component, root, loader, handle, children)
+    addRoute(pathSegments, Component, root)
   })
 
   return root

package/src/extensions/types.ts

@@ -13,8 +13,6 @@ import { ZodFirstPartySchemaTypes } from "zod"
 export type RouteExtension = {
   Component: ComponentType
   loader?: LoaderFunction
-  handle?: object
-  children?: RouteExtension[]
   path: string
 }
 

package/src/hooks/table/query/use-product-table-query.tsx

@@ -6,9 +6,6 @@ type UseProductTableQueryProps = {
   pageSize?: number
 }
 
-const DEFAULT_FIELDS =
-  "id,title,handle,status,*collection,*sales_channels,variants.id"
-
 export const useProductTableQuery = ({
   prefix,
   pageSize = 20,
@@ -61,7 +58,6 @@ export const useProductTableQuery = ({
     type_id: type_id?.split(","),
     status: status?.split(",") as HttpTypes.AdminProductStatus[],
     q,
-    fields: DEFAULT_FIELDS,
   }
 
   return {

package/src/i18n/translations/$schema.json

@@ -4806,9 +4806,6 @@
             "markAsShipped": {
               "type": "string"
             },
-            "markAsPickedUp": {
-              "type": "string"
-            },
             "markAsDelivered": {
               "type": "string"
             },
@@ -4918,17 +4915,13 @@
                 },
                 "fulfillmentDelivered": {
                   "type": "string"
-                },
-                "fulfillmentPickedUp": {
-                  "type": "string"
                 }
               },
               "required": [
                 "created",
                 "canceled",
                 "fulfillmentShipped",
-                "fulfillmentDelivered",
-                "fulfillmentPickedUp"
+                "fulfillmentDelivered"
               ],
               "additionalProperties": false
             },
@@ -4959,7 +4952,6 @@
             "available",
             "inStock",
             "markAsShipped",
-            "markAsPickedUp",
             "markAsDelivered",
             "itemsToFulfillDesc",
             "locationDescription",
@@ -5762,23 +5754,6 @@
           ],
           "additionalProperties": false
         },
-        "pickupOptions": {
-          "type": "object",
-          "properties": {
-            "edit": {
-              "type": "object",
-              "properties": {
-                "header": {
-                  "type": "string"
-                }
-              },
-              "required": ["header"],
-              "additionalProperties": false
-            }
-          },
-          "required": ["edit"],
-          "additionalProperties": false
-        },
         "shippingOptions": {
           "type": "object",
           "properties": {
@@ -5804,25 +5779,6 @@
                   "required": ["header", "hint", "label", "successToast"],
                   "additionalProperties": false
                 },
-                "pickup": {
-                  "type": "object",
-                  "properties": {
-                    "header": {
-                      "type": "string"
-                    },
-                    "hint": {
-                      "type": "string"
-                    },
-                    "label": {
-                      "type": "string"
-                    },
-                    "successToast": {
-                      "type": "string"
-                    }
-                  },
-                  "required": ["header", "hint", "label", "successToast"],
-                  "additionalProperties": false
-                },
                 "returns": {
                   "type": "object",
                   "properties": {
@@ -5859,7 +5815,7 @@
                   "type": "string"
                 }
               },
-              "required": ["shipping", "pickup", "returns", "tabs", "action"],
+              "required": ["shipping", "returns", "tabs", "action"],
               "additionalProperties": false
             },
             "delete": {
@@ -6040,12 +5996,6 @@
                     "shipping_other": {
                       "type": "string"
                     },
-                    "pickup_one": {
-                      "type": "string"
-                    },
-                    "pickup_other": {
-                      "type": "string"
-                    },
                     "returns_one": {
                       "type": "string"
                     },
@@ -6056,8 +6006,6 @@
                   "required": [
                     "shipping_one",
                     "shipping_other",
-                    "pickup_one",
-                    "pickup_other",
                     "returns_one",
                     "returns_other"
                   ],
@@ -6253,7 +6201,6 @@
         "fulfillmentSets",
         "sidebar",
         "salesChannels",
-        "pickupOptions",
         "shippingOptions",
         "serviceZones"
       ],

package/src/i18n/translations/en.json

@@ -1281,7 +1281,6 @@
       "available": "Available",
       "inStock": "In stock",
       "markAsShipped": "Mark as shipped",
-      "markAsPickedUp": "Mark as picked up",
       "markAsDelivered": "Mark as delivered",
       "itemsToFulfillDesc": "Choose items and quantities to fulfill",
       "locationDescription": "Choose which location you want to fulfill items from.",
@@ -1311,8 +1310,7 @@
         "created": "Fulfillment created successfully",
         "canceled": "Fulfillment successfully canceled",
         "fulfillmentShipped": "Cannot cancel an already shipped fulfillment",
-        "fulfillmentDelivered": "Fulfillment marked as delivered successfully",
-        "fulfillmentPickedUp": "Fulfillment marked as picked up successfully"
+        "fulfillmentDelivered": "Fulfillment marked as delivered successfully"
       },
       "trackingLabel": "Tracking",
       "shippingFromLabel": "Shipping from",
@@ -1522,11 +1520,6 @@
       "action": "Connect sales channels",
       "successToast": "Sales channels were successfully updated."
     },
-    "pickupOptions": {
-      "edit": {
-        "header": "Edit Pickup Option"
-      }
-    },
     "shippingOptions": {
       "create": {
         "shipping": {
@@ -1535,12 +1528,6 @@
           "label": "Shipping options",
           "successToast": "Shipping option {{name}} was successfully created."
         },
-        "pickup": {
-          "header": "Create Pickup Option for {{zone}}",
-          "hint": "Create a new pickup option to define how products are picked up from this location.",
-          "label": "Pickup options",
-          "successToast": "Pickup option {{name}} was successfully created."
-        },
         "returns": {
           "header": "Create a Return Option for {{zone}}",
           "hint": "Create a new return option to define how products are returned to this location.",
@@ -1604,8 +1591,6 @@
         "count": {
           "shipping_one": "{{count}} shipping option",
           "shipping_other": "{{count}} shipping options",
-          "pickup_one": "{{count}} pickup option",
-          "pickup_other": "{{count}} pickup options",
           "returns_one": "{{count}} return option",
           "returns_other": "{{count}} return options"
         },

package/src/providers/router-provider/route-extensions.tsx

@@ -10,4 +10,3 @@ const routes = getRouteExtensions(routeModule, "core")
  * Core Route extensions.
  */
 export const RouteExtensions = createRouteMap(routes)
-console.log(RouteExtensions)

package/src/routes/api-key-management/api-key-management-detail/components/api-key-general-section/api-key-general-section.tsx

@@ -154,9 +154,7 @@ export const ApiKeyGeneralSection = ({ apiKey }: ApiKeyGeneralSectionProps) => {
           {t("fields.key")}
         </Text>
         {apiKey.type === "secret" ? (
-          <Badge size="2xsmall" className="inline-block w-fit">
-            {prettifyRedactedToken(apiKey.redacted)}
-          </Badge>
+          <Badge size="2xsmall">{prettifyRedactedToken(apiKey.redacted)}</Badge>
         ) : (
           <Copy asChild content={apiKey.token} className="cursor-pointer">
             <Badge size="2xsmall" className="text-ui-tag-neutral-text">