diff --git a/.changeset/soft-doors-marry.md b/.changeset/soft-doors-marry.md new file mode 100644 index 0000000000..78c74ff8b1 --- /dev/null +++ b/.changeset/soft-doors-marry.md @@ -0,0 +1,5 @@ +--- +"@medusajs/admin-ui": patch +--- + +fix(admin-ui): minor fixes for reservation management diff --git a/packages/admin-ui/ui/src/components/molecules/item-search/index.tsx b/packages/admin-ui/ui/src/components/molecules/item-search/index.tsx index a02096eac5..20bb18064d 100644 --- a/packages/admin-ui/ui/src/components/molecules/item-search/index.tsx +++ b/packages/admin-ui/ui/src/components/molecules/item-search/index.tsx @@ -64,7 +64,7 @@ const ItemSearch = ({ onItemSelect, clearOnSelect, filters = {} }: Props) => { components={{ Option: ProductOption, Control: SearchControl }} onInputChange={setItemSearchTerm} options={options} - placeholder="Choose an item" + placeholder="Search by sku..." isSearchable={true} noOptionsMessage={() => "No items found"} openMenuOnClick={!!inventory_items?.length} diff --git a/packages/admin-ui/ui/src/components/templates/inventory-table/index.tsx b/packages/admin-ui/ui/src/components/templates/inventory-table/index.tsx index 409b248ffe..f2d2c06ac0 100644 --- a/packages/admin-ui/ui/src/components/templates/inventory-table/index.tsx +++ b/packages/admin-ui/ui/src/components/templates/inventory-table/index.tsx @@ -146,7 +146,9 @@ const InventoryTable: React.FC = () => { refreshWithFilters() }, [representationObject]) - const [columns] = useInventoryTableColumn() + const [columns] = useInventoryTableColumn({ + location_id: queryObject.location_id, + }) const { getTableProps, diff --git a/packages/admin-ui/ui/src/components/templates/inventory-table/use-inventory-column.tsx b/packages/admin-ui/ui/src/components/templates/inventory-table/use-inventory-column.tsx index 6f0130fa11..3f72f86f2f 100644 --- a/packages/admin-ui/ui/src/components/templates/inventory-table/use-inventory-column.tsx +++ b/packages/admin-ui/ui/src/components/templates/inventory-table/use-inventory-column.tsx @@ -1,14 +1,17 @@ -import * as RadixPopover from "@radix-ui/react-popover" - -import { Navigate, useNavigate } from "react-router-dom" - import Button from "../../fundamentals/button" +import { Column } from "@tanstack/react-table" +import { DecoratedInventoryItemDTO } from "@medusajs/medusa" import ImagePlaceholder from "../../fundamentals/image-placeholder" import { InventoryLevelDTO } from "@medusajs/types" import Tooltip from "../../atoms/tooltip" import { useMemo } from "react" +import { useNavigate } from "react-router-dom" -const useInventoryTableColumn = () => { +const useInventoryTableColumn = ({ + location_id, +}: { + location_id: string +}): [Column[]] => { const columns = useMemo( () => [ { @@ -59,7 +62,9 @@ const useInventoryTableColumn = () => { variant="ghost" onClick={() => { navigate( - `/a/inventory/reservations?inventory_item_id%5B0%5D=${original.id}` + `/a/inventory/reservations?inventory_item_id%5B0%5D=${ + original.id + }${location_id ? `&location_id=${location_id}` : ""}` ) }} > @@ -95,7 +100,7 @@ const useInventoryTableColumn = () => { }, }, ], - [] + [location_id] ) return [columns] as const diff --git a/packages/admin-ui/ui/src/domain/orders/details/reservation/edit-reservation-modal.tsx b/packages/admin-ui/ui/src/domain/orders/details/reservation/edit-reservation-modal.tsx index 42ef3318b7..4e31a3e898 100644 --- a/packages/admin-ui/ui/src/domain/orders/details/reservation/edit-reservation-modal.tsx +++ b/packages/admin-ui/ui/src/domain/orders/details/reservation/edit-reservation-modal.tsx @@ -139,7 +139,7 @@ const EditReservationDrawer = ({ { quantity: data.item.quantity, location_id: data.location.value, - description: data.item.description || undefined, + description: data.item.description, metadata: hasMetadata ? getSubmittableMetadata(data.metadata) : undefined,