The complete open source platform to run your entire marketplace. Storefront, vendor panel, admin console, and integrations in one enterprise-grade platform you own.
TypeScript b2b-marketplacecomposable-commerceecommerceenterpriseheadless-commercemarketplacemedusamedusajsmulti-vendortypescript
fix: include pending changes for canary.54 release
vholikff486f1e3863
diff --git a/bun.lock b/bun.lockindex df543c80f..3f7ba15cc 100644--- a/bun.lock+++ b/bun.lock@@ -118,7 +118,7 @@},"packages/admin": {"name": "@mercurjs/admin",- "version": "2.0.0-canary.53",+ "version": "2.0.0-canary.54","dependencies": {"@ariakit/react": "^0.4.15","@babel/runtime": "^7.26.10",@@ -178,7 +178,7 @@},"packages/cli": {"name": "@mercurjs/cli",- "version": "2.0.0-canary.53",+ "version": "2.0.0-canary.54","bin": {"mercurjs": "./dist/index.js",},@@ -218,7 +218,7 @@},"packages/client": {"name": "@mercurjs/client",- "version": "2.0.0-canary.53",+ "version": "2.0.0-canary.54","dependencies": {"@tanstack/react-query": "^5.64.2","qs": "^6.12.1",@@ -235,7 +235,7 @@},"packages/core-plugin": {"name": "@mercurjs/core-plugin",- "version": "2.0.0-canary.53",+ "version": "2.0.0-canary.54","devDependencies": {"@medusajs/cli": "^2.13.3","@medusajs/core-flows": "^2.13.3",@@ -274,7 +274,7 @@},"packages/dashboard-sdk": {"name": "@mercurjs/dashboard-sdk",- "version": "2.0.0-canary.53",+ "version": "2.0.0-canary.54","dependencies": {"esbuild-register": "^3.6.0",},@@ -288,7 +288,7 @@},"packages/dashboard-shared": {"name": "@mercurjs/dashboard-shared",- "version": "2.0.0-canary.53",+ "version": "2.0.0-canary.54","dependencies": {"@ariakit/react": "^0.4.15","@babel/runtime": "^7.26.10",@@ -355,6 +355,7 @@"@mercurjs/dashboard-sdk": "workspace:*","@mercurjs/dashboard-shared": "workspace:*","@mercurjs/vendor": "workspace:*",+ "@talkjs/react": "^0.1.11","@tanstack/react-query": "5.64.2","@tanstack/react-table": "8.20.5","algoliasearch": "^5.40.0",@@ -379,7 +380,7 @@},"packages/types": {"name": "@mercurjs/types",- "version": "2.0.0-canary.53",+ "version": "2.0.0-canary.54","dependencies": {"@medusajs/types": "2.13.3",},@@ -389,7 +390,7 @@},"packages/vendor": {"name": "@mercurjs/vendor",- "version": "2.0.0-canary.53",+ "version": "2.0.0-canary.54","dependencies": {"@ariakit/react": "^0.4.15","@babel/runtime": "^7.26.10",@@ -1723,6 +1724,8 @@"@tailwindcss/forms": ["@tailwindcss/[email protected]", "", { "dependencies": { "mini-svg-data-uri": "^1.2.3" }, "peerDependencies": { "tailwindcss": ">=3.0.0 || >= 3.0.0-alpha.1 || >= 4.0.0-alpha.20 || >= 4.0.0-beta.1" } }, "sha512-h9wegbZDPurxG22xZSoWtdzc41/OlNEUQERNqI/0fOwa2aVlWGu7C35E/x6LDyD3lgtztFSSjKZyuVM0hxhbgA=="],+ "@talkjs/react": ["@talkjs/[email protected]", "", { "dependencies": { "fast-deep-equal": "^3.1.3" }, "peerDependencies": { "react": ">=17", "talkjs": ">=0" } }, "sha512-/lFX9FN5rpKrqiJ1/V392ywskv9MO/QN9T3YebwYrHEarYMtvhCFPwlMagG5jmNWF675/MVxiztPA2PS5pxYyQ=="],+"@tanstack/query-core": ["@tanstack/[email protected]", "", {}, "sha512-hdO8SZpWXoADNTWXV9We8CwTkXU88OVWRBcsiFrk7xJQnhm6WRlweDzMD+uH+GnuieTBVSML6xFa17C2cNV8+g=="],"@tanstack/react-query": ["@tanstack/[email protected]", "", { "dependencies": { "@tanstack/query-core": "5.64.2" }, "peerDependencies": { "react": "^18 || ^19" } }, "sha512-3pakNscZNm8KJkxmovvtZ4RaXLyiYYobwleTMvpIGUoKRa8j8VlrQKNl5W8VUEfVfZKkikvXVddLuWMbcSCA1Q=="],@@ -3227,6 +3230,8 @@"tailwindcss-animate": ["[email protected]", "", { "peerDependencies": { "tailwindcss": ">=3.0.0 || insiders" } }, "sha512-bl6mpH3T7I3UFxuvDEXLxy/VuFxBk5bbzplh7tXI68mwMokNYd1t9qPBHlnyTwfa4JGC4zP516I1hYYtQ/vspA=="],+ "talkjs": ["[email protected]", "", {}, "sha512-UL7QgwdV1lZc5jxHEgSSf8fRzAgzqDWbA23OHKe/RXersgV3nfFUvu6Nd99LAt/HuGesfr7uB2SouFPSk70kPA=="],+"tar": ["[email protected]", "", { "dependencies": { "@isaacs/fs-minipass": "^4.0.0", "chownr": "^3.0.0", "minipass": "^7.1.2", "minizlib": "^3.1.0", "yallist": "^5.0.0" } }, "sha512-BTLcK0xsDh2+PUe9F6c2TlRp4zOOBMTkoQHQIWSIzI0R7KG46uEwq4OPk2W7bZcprBMsuaeFsqwYr7pjh6CuHg=="],"tarn": ["[email protected]", "", {}, "sha512-51LAVKUSZSVfI05vjPESNc5vwqqZpbXCsU+/+wxlOrUjk2SnFTt97v9ZgQrD4YmxYW1Px6w2KjaDitCfkvgxMQ=="],diff --git a/packages/admin/src/pages/orders/order-detail/components/order-activity-section/order-timeline.tsx b/packages/admin/src/pages/orders/order-detail/components/order-activity-section/order-timeline.tsxindex 2ed9b8af7..367246f37 100644--- a/packages/admin/src/pages/orders/order-detail/components/order-activity-section/order-timeline.tsx+++ b/packages/admin/src/pages/orders/order-detail/components/order-activity-section/order-timeline.tsx@@ -1,7 +1,7 @@-import { Button, Text, Tooltip, clx, toast, usePrompt } from "@medusajs/ui"-import { Collapsible as RadixCollapsible } from "radix-ui"+import { Button, Text, Tooltip, clx, toast, usePrompt } from "@medusajs/ui";+import { Collapsible as RadixCollapsible } from "radix-ui";-import { PropsWithChildren, ReactNode, useMemo, useState } from "react"+import { PropsWithChildren, ReactNode, useMemo, useState } from "react";import {AdminClaim,@@ -10,41 +10,42 @@ import {AdminOrder,AdminOrderChange,AdminReturn,-} from "@medusajs/types"-import { useTranslation } from "react-i18next"+} from "@medusajs/types";+import { useTranslation } from "react-i18next";-import { AdminOrderLineItem } from "@medusajs/types"-import { By } from "../../../../../components/common/user-link"+import { AdminOrderLineItem } from "@medusajs/types";+import { By } from "../../../../../components/common/user-link";import {useCancelOrderTransfer,useCustomer,useOrderChanges,useOrderLineItems,-} from "../../../../../hooks/api"-import { useCancelClaim, useClaims } from "../../../../../hooks/api/claims"+} from "../../../../../hooks/api";+import { useCancelClaim, useClaims } from "../../../../../hooks/api/claims";import {useCancelExchange,useExchanges,-} from "../../../../../hooks/api/exchanges"-import { useCancelReturn, useReturns } from "../../../../../hooks/api/returns"-import { useDate } from "../../../../../hooks/use-date"-import { getFormattedAddress } from "../../../../../lib/addresses"-import { getStylizedAmount } from "../../../../../lib/money-amount-helpers"-import { getPaymentsFromOrder } from "../../../../../lib/orders"-import ActivityItems from "./activity-items"-import ChangeDetailsTooltip from "./change-details-tooltip"+} from "../../../../../hooks/api/exchanges";+import { useCancelReturn, useReturns } from "../../../../../hooks/api/returns";+import { useDate } from "../../../../../hooks/use-date";+import { getFormattedAddress } from "../../../../../lib/addresses";+import { getStylizedAmount } from "../../../../../lib/money-amount-helpers";+import { getDisplayFulfillmentItems } from "../../../../../lib/order-item";+import { getPaymentsFromOrder } from "../../../../../lib/orders";+import ActivityItems from "./activity-items";+import ChangeDetailsTooltip from "./change-details-tooltip";type OrderTimelineProps = {- order: AdminOrder-}+ order: AdminOrder;+};/*** Order Changes that are not related to RMA flows*/-const NON_RMA_CHANGE_TYPES = ["transfer", "update_order"]+const NON_RMA_CHANGE_TYPES = ["transfer", "update_order"];export const OrderTimeline = ({ order }: OrderTimelineProps) => {- const items = useActivityItems(order)+ const items = useActivityItems(order);if (items.length <= 3) {return (@@ -62,15 +63,15 @@ export const OrderTimeline = ({ order }: OrderTimelineProps) => {>{item.children}</OrderActivityItem>- )+ );})}</div>- )+ );}- const lastItems = items.slice(0, 2)- const collapsibleItems = items.slice(2, items.length - 1)- const firstItem = items[items.length - 1]+ const lastItems = items.slice(0, 2);+ const collapsibleItems = items.slice(2, items.length - 1);+ const firstItem = items[items.length - 1];return (<div className="flex flex-col gap-y-0.5" data-testid="order-timeline">@@ -86,7 +87,7 @@ export const OrderTimeline = ({ order }: OrderTimelineProps) => {>{item.children}</OrderActivityItem>- )+ );})}<OrderActivityCollapsible activities={collapsibleItems} /><OrderActivityItem@@ -100,23 +101,23 @@ export const OrderTimeline = ({ order }: OrderTimelineProps) => {{firstItem.children}</OrderActivityItem></div>- )-}+ );+};type Activity = {- title: string- timestamp: string | Date- children?: ReactNode+ title: string;+ timestamp: string | Date;+ children?: ReactNode;itemsToSend?: (| AdminClaim["additional_items"]| AdminExchange["additional_items"]- )[]- itemsToReturn?: AdminReturn["items"]- itemsMap?: Map<string, AdminOrderLineItem>-}+ )[];+ itemsToReturn?: AdminReturn["items"];+ itemsMap?: Map<string, AdminOrderLineItem>;+};const useActivityItems = (order: AdminOrder): Activity[] => {- const { t } = useTranslation()+ const { t } = useTranslation();const { order_changes: orderChanges = [] } = useOrderChanges(order.id, {change_type: [@@ -127,13 +128,13 @@ const useActivityItems = (order: AdminOrder): Activity[] => {"transfer","update_order",],- })+ });const rmaChanges = orderChanges.filter(- (oc) => !NON_RMA_CHANGE_TYPES.includes(oc.change_type)- )+ (oc) => !NON_RMA_CHANGE_TYPES.includes(oc.change_type),+ );- const missingLineItemIds = getMissingLineItemIds(order, rmaChanges)+ const missingLineItemIds = getMissingLineItemIds(order, rmaChanges);const { order_items: removedLineItems = [] } = useOrderLineItems(order.id,@@ -143,42 +144,42 @@ const useActivityItems = (order: AdminOrder): Activity[] => {},{enabled: !!rmaChanges.length,- }- )+ },+ );const itemsMap = useMemo(() => {- const _itemsMap = new Map(order?.items?.map((i) => [i.id, i]))+ const _itemsMap = new Map(order?.items?.map((i) => [i.id, i]));for (const id of missingLineItemIds) {- const i = removedLineItems.find((i) => i.item.id === id)+ const i = removedLineItems.find((i) => i.item.id === id);if (i) {- _itemsMap.set(id, { ...i.item, quantity: i.quantity }) // copy quantity from OrderItem to OrderLineItem+ _itemsMap.set(id, { ...i.item, quantity: i.quantity }); // copy quantity from OrderItem to OrderLineItem}}- return _itemsMap- }, [order.items, removedLineItems, missingLineItemIds])+ return _itemsMap;+ }, [order.items, removedLineItems, missingLineItemIds]);const { returns = [] } = useReturns({order_id: order.id,fields: "+received_at,*items",- })+ });const { claims = [] } = useClaims({order_id: order.id,fields: "*additional_items",- })+ });const { exchanges = [] } = useExchanges({order_id: order.id,fields: "*additional_items",- })+ });- const payments = getPaymentsFromOrder(order)+ const payments = getPaymentsFromOrder(order);- const notes = []- const isLoading = false+ const notes = [];+ const isLoading = false;// const { notes, isLoading, isError, error } = useNotes(// {// resource_id: order.id,@@ -196,13 +197,13 @@ const useActivityItems = (order: AdminOrder): Activity[] => {return useMemo(() => {if (isLoading) {- return []+ return [];}- const items: Activity[] = []+ const items: Activity[] = [];for (const payment of payments) {- const amount = payment.amount as number+ const amount = payment.amount as number;items.push({title: t("orders.activity.events.payment.awaiting"),@@ -212,7 +213,7 @@ const useActivityItems = (order: AdminOrder): Activity[] => {{getStylizedAmount(amount, payment.currency_code)}</Text>),- })+ });if (payment.canceled_at) {items.push({@@ -223,7 +224,7 @@ const useActivityItems = (order: AdminOrder): Activity[] => {{getStylizedAmount(amount, payment.currency_code)}</Text>),- })+ });}if (payment.captured_at) {@@ -235,7 +236,7 @@ const useActivityItems = (order: AdminOrder): Activity[] => {{getStylizedAmount(amount, payment.currency_code)}</Text>),- })+ });}for (const refund of payment.refunds || []) {@@ -246,11 +247,11 @@ const useActivityItems = (order: AdminOrder): Activity[] => {<Text size="small" className="text-ui-fg-subtle">{getStylizedAmount(refund.amount as number,- payment.currency_code+ payment.currency_code,)}</Text>),- })+ });}}@@ -259,18 +260,24 @@ const useActivityItems = (order: AdminOrder): Activity[] => {title: t("orders.activity.events.fulfillment.created"),timestamp: fulfillment.created_at,children: (- <FulfillmentCreatedBody fulfillment={fulfillment} itemsMap={itemsMap} />+ <FulfillmentCreatedBody+ fulfillment={fulfillment}+ itemsMap={itemsMap}+ />),- })+ });if (fulfillment.delivered_at) {items.push({title: t("orders.activity.events.fulfillment.delivered"),timestamp: fulfillment.delivered_at,children: (- <FulfillmentCreatedBody fulfillment={fulfillment} itemsMap={itemsMap} />+ <FulfillmentCreatedBody+ fulfillment={fulfillment}+ itemsMap={itemsMap}+ />),- })+ });}if (fulfillment.shipped_at) {@@ -284,24 +291,24 @@ const useActivityItems = (order: AdminOrder): Activity[] => {itemsMap={itemsMap}/>),- })+ });}if (fulfillment.canceled_at) {items.push({title: t("orders.activity.events.fulfillment.canceled"),timestamp: fulfillment.canceled_at,- })+ });}}- const returnMap = new Map<string, AdminReturn>()+ const returnMap = new Map<string, AdminReturn>();for (const ret of returns) {- returnMap.set(ret.id, ret)+ returnMap.set(ret.id, ret);if (ret.claim_id || ret.exchange_id) {- continue+ continue;}// Always display created action@@ -313,7 +320,7 @@ const useActivityItems = (order: AdminOrder): Activity[] => {itemsToReturn: ret?.items,itemsMap,children: <ReturnBody orderReturn={ret} isCreated={!ret.canceled_at} />,- })+ });if (ret.canceled_at) {items.push({@@ -321,7 +328,7 @@ const useActivityItems = (order: AdminOrder): Activity[] => {returnId: ret.id.slice(-7),}),timestamp: ret.canceled_at,- })+ });}if (ret.status === "received" || ret.status === "partially_received") {@@ -333,12 +340,12 @@ const useActivityItems = (order: AdminOrder): Activity[] => {itemsToReturn: ret?.items,itemsMap,children: <ReturnBody orderReturn={ret} isReceived />,- })+ });}}for (const claim of claims) {- const claimReturn = returnMap.get(claim.return_id!)+ const claimReturn = returnMap.get(claim.return_id!);items.push({title: t(@@ -347,18 +354,18 @@ const useActivityItems = (order: AdminOrder): Activity[] => {: "orders.activity.events.claim.created",{claimId: claim.id.slice(-7),- }+ },),timestamp: claim.canceled_at || claim.created_at,itemsToSend: claim.additional_items,itemsToReturn: claimReturn?.items,itemsMap,children: <ClaimBody claim={claim} claimReturn={claimReturn} />,- })+ });}for (const exchange of exchanges) {- const exchangeReturn = returnMap.get(exchange.return_id!)+ const exchangeReturn = returnMap.get(exchange.return_id!);items.push({title: t(@@ -367,7 +374,7 @@ const useActivityItems = (order: AdminOrder): Activity[] => {: "orders.activity.events.exchange.created",{exchangeId: exchange.id.slice(-7),- }+ },),timestamp: exchange.canceled_at || exchange.created_at,itemsToSend: exchange.additional_items,@@ -376,15 +383,15 @@ const useActivityItems = (order: AdminOrder): Activity[] => {children: (<ExchangeBody exchange={exchange} exchangeReturn={exchangeReturn} />),- })+ });}for (const edit of orderChanges.filter((oc) => oc.change_type === "edit")) {- const isConfirmed = edit.status === "confirmed"- const isPending = edit.status === "pending"+ const isConfirmed = edit.status === "confirmed";+ const isPending = edit.status === "pending";if (isPending) {- continue+ continue;}items.push({@@ -402,11 +409,11 @@ const useActivityItems = (order: AdminOrder): Activity[] => {? edit.canceled_at: edit.created_at,children: isConfirmed ? <OrderEditBody edit={edit} /> : null,- })+ });}for (const transfer of orderChanges.filter(- (oc) => oc.change_type === "transfer"+ (oc) => oc.change_type === "transfer",)) {if (transfer.requested_at) {items.push({@@ -415,7 +422,7 @@ const useActivityItems = (order: AdminOrder): Activity[] => {}),timestamp: transfer.requested_at,children: <TransferOrderRequestBody transfer={transfer} />,- })+ });}if (transfer.confirmed_at) {@@ -424,7 +431,7 @@ const useActivityItems = (order: AdminOrder): Activity[] => {transferId: transfer.id.slice(-7),}),timestamp: transfer.confirmed_at,- })+ });}if (transfer.declined_at) {items.push({@@ -432,14 +439,14 @@ const useActivityItems = (order: AdminOrder): Activity[] => {transferId: transfer.id.slice(-7),}),timestamp: transfer.declined_at,- })+ });}}for (const update of orderChanges.filter(- (oc) => oc.change_type === "update_order"+ (oc) => oc.change_type === "update_order",)) {- const updateType = update.actions[0]?.details?.type+ const updateType = update.actions[0]?.details?.type;if (updateType === "shipping_address") {items.push({@@ -460,7 +467,7 @@ const useActivityItems = (order: AdminOrder): Activity[] => {{t("fields.by")} <By id={update.created_by} /></div>),- })+ });}if (updateType === "billing_address") {@@ -482,7 +489,7 @@ const useActivityItems = (order: AdminOrder): Activity[] => {{t("fields.by")} <By id={update.created_by} /></div>),- })+ });}if (updateType === "email") {@@ -500,7 +507,7 @@ const useActivityItems = (order: AdminOrder): Activity[] => {{t("fields.by")} <By id={update.created_by} /></div>),- })+ });}}@@ -516,12 +523,12 @@ const useActivityItems = (order: AdminOrder): Activity[] => {items.push({title: t("orders.activity.events.canceled.title"),timestamp: order.canceled_at,- })+ });}const sortedActivities = items.sort((a, b) => {- return new Date(b.timestamp).getTime() - new Date(a.timestamp).getTime()- })+ return new Date(b.timestamp).getTime() - new Date(a.timestamp).getTime();+ });const createdAt = {title: t("orders.activity.events.placed.title"),@@ -531,9 +538,9 @@ const useActivityItems = (order: AdminOrder): Activity[] => {{getStylizedAmount(order.total, order.currency_code)}</Text>),- }+ };- return [...sortedActivities, createdAt]+ return [...sortedActivities, createdAt];}, [order,payments,@@ -543,19 +550,19 @@ const useActivityItems = (order: AdminOrder): Activity[] => {notes,isLoading,itemsMap,- ])-}+ ]);+};type OrderActivityItemProps = PropsWithChildren<{- title: string- timestamp: string | Date- isFirst?: boolean+ title: string;+ timestamp: string | Date;+ isFirst?: boolean;itemsToSend?:| AdminClaim["additional_items"]- | AdminExchange["additional_items"]- itemsToReturn?: AdminReturn["items"]- itemsMap?: Map<string, AdminOrderLineItem>-}>+ | AdminExchange["additional_items"];+ itemsToReturn?: AdminReturn["items"];+ itemsMap?: Map<string, AdminOrderLineItem>;+}>;const OrderActivityItem = ({title,@@ -566,11 +573,17 @@ const OrderActivityItem = ({itemsToReturn,itemsMap,}: OrderActivityItemProps) => {- const { getFullDate, getRelativeDate } = useDate()+ const { getFullDate, getRelativeDate } = useDate();return (- <div className="grid grid-cols-[20px_1fr] items-start gap-2" data-testid="order-activity-item">- <div className="flex size-full flex-col items-center gap-y-0.5" data-testid="order-activity-item-indicator">+ <div+ className="grid grid-cols-[20px_1fr] items-start gap-2"+ data-testid="order-activity-item"+ >+ <div+ className="flex size-full flex-col items-center gap-y-0.5"+ data-testid="order-activity-item-indicator"+ ><div className="flex size-5 items-center justify-center"><div className="bg-ui-bg-base shadow-borders-base flex size-2.5 items-center justify-center rounded-full"><div className="bg-ui-tag-neutral-icon size-1.5 rounded-full" />@@ -594,7 +607,12 @@ const OrderActivityItem = ({itemsMap={itemsMap}/>) : (- <Text size="small" leading="compact" weight="plus" data-testid="order-activity-item-title">+ <Text+ size="small"+ leading="compact"+ weight="plus"+ data-testid="order-activity-item-title"+ >{title}</Text>)}@@ -616,20 +634,20 @@ const OrderActivityItem = ({<div>{children}</div></div></div>- )-}+ );+};const OrderActivityCollapsible = ({activities,}: {- activities: Activity[]+ activities: Activity[];}) => {- const [open, setOpen] = useState(false)+ const [open, setOpen] = useState(false);- const { t } = useTranslation()+ const { t } = useTranslation();if (!activities.length) {- return null+ return null;}return (@@ -669,13 +687,13 @@ const OrderActivityCollapsible = ({>{item.children}</OrderActivityItem>- )+ );})}</div></RadixCollapsible.Content></RadixCollapsible.Root>- )-}+ );+};/*** TODO: Add once notes are supported.@@ -742,15 +760,15 @@ const OrderActivityCollapsible = ({const FulfillmentCreatedBody = ({fulfillment,}: {- fulfillment: AdminFulfillment- itemsMap?: Map<string, AdminOrderLineItem>+ fulfillment: AdminFulfillment;+ itemsMap: Map<string, AdminOrderLineItem>;}) => {- const { t } = useTranslation()+ const { t } = useTranslation();- const numberOfItems = (fulfillment.items || []).reduce(- (acc, item) => acc + item.quantity,- 0- )+ const numberOfItems = getDisplayFulfillmentItems(+ fulfillment.items || [],+ itemsMap,+ ).reduce((acc, item) => acc + item.quantity, 0);return (<div>@@ -760,25 +778,25 @@ const FulfillmentCreatedBody = ({})}</Text></div>- )-}+ );+};const ReturnBody = ({orderReturn,isCreated,isReceived,}: {- orderReturn: AdminReturn- isCreated: boolean- isReceived?: boolean+ orderReturn: AdminReturn;+ isCreated: boolean;+ isReceived?: boolean;}) => {- const prompt = usePrompt()- const { t } = useTranslation()+ const prompt = usePrompt();+ const { t } = useTranslation();const { mutateAsync: cancelReturnRequest } = useCancelReturn(orderReturn.id,- orderReturn.order_id- )+ orderReturn.order_id,+ );const onCancel = async () => {const res = await prompt({@@ -786,20 +804,20 @@ const ReturnBody = ({description: t("orders.returns.cancel.description"),confirmText: t("actions.confirm"),cancelText: t("actions.cancel"),- })+ });if (!res) {- return+ return;}await cancelReturnRequest().catch((error) => {- toast.error(error.message)- })- }+ toast.error(error.message);+ });+ };const numberOfItems = orderReturn.items.reduce((acc, item) => {- return acc + (isReceived ? item.received_quantity : item.quantity) // TODO: revisit when we add dismissed quantity on ReturnItem- }, 0)+ return acc + (isReceived ? item.received_quantity : item.quantity); // TODO: revisit when we add dismissed quantity on ReturnItem+ }, 0);return (<div className="flex items-start gap-1">@@ -822,22 +840,22 @@ const ReturnBody = ({</>)}</div>- )-}+ );+};const ClaimBody = ({claim,claimReturn,}: {- claim: AdminClaim- claimReturn?: AdminReturn+ claim: AdminClaim;+ claimReturn?: AdminReturn;}) => {- const prompt = usePrompt()- const { t } = useTranslation()+ const prompt = usePrompt();+ const { t } = useTranslation();- const isCanceled = !!claim.created_at+ const isCanceled = !!claim.created_at;- const { mutateAsync: cancelClaim } = useCancelClaim(claim.id, claim.order_id)+ const { mutateAsync: cancelClaim } = useCancelClaim(claim.id, claim.order_id);const onCancel = async () => {const res = await prompt({@@ -845,26 +863,26 @@ const ClaimBody = ({description: t("orders.claims.cancel.description"),confirmText: t("actions.confirm"),cancelText: t("actions.cancel"),- })+ });if (!res) {- return+ return;}await cancelClaim().catch((error) => {- toast.error(error.message)- })- }+ toast.error(error.message);+ });+ };const outboundItems = (claim.additional_items || []).reduce((acc, item) => (acc + item.quantity) as number,- 0- )+ 0,+ );const inboundItems = (claimReturn?.items || []).reduce((acc, item) => acc + item.quantity,- 0- )+ 0,+ );return (<div>@@ -895,25 +913,25 @@ const ClaimBody = ({</Button>)}</div>- )-}+ );+};const ExchangeBody = ({exchange,exchangeReturn,}: {- exchange: AdminExchange- exchangeReturn?: AdminReturn+ exchange: AdminExchange;+ exchangeReturn?: AdminReturn;}) => {- const prompt = usePrompt()- const { t } = useTranslation()+ const prompt = usePrompt();+ const { t } = useTranslation();- const isCanceled = !!exchange.canceled_at+ const isCanceled = !!exchange.canceled_at;const { mutateAsync: cancelExchange } = useCancelExchange(exchange.id,- exchange.order_id- )+ exchange.order_id,+ );const onCancel = async () => {const res = await prompt({@@ -921,26 +939,26 @@ const ExchangeBody = ({description: t("orders.exchanges.cancel.description"),confirmText: t("actions.confirm"),cancelText: t("actions.cancel"),- })+ });if (!res) {- return+ return;}await cancelExchange().catch((error) => {- toast.error(error.message)- })- }+ toast.error(error.message);+ });+ };const outboundItems = (exchange.additional_items || []).reduce((acc, item) => (acc + item.quantity) as number,- 0- )+ 0,+ );const inboundItems = (exchangeReturn?.items || []).reduce((acc, item) => acc + item.quantity,- 0- )+ 0,+ );return (<div>@@ -971,16 +989,16 @@ const ExchangeBody = ({</Button>)}</div>- )-}+ );+};const OrderEditBody = ({ edit }: { edit: AdminOrderChange }) => {- const { t } = useTranslation()+ const { t } = useTranslation();const [itemsAdded, itemsRemoved] = useMemo(() => countItemsChange(edit.actions),- [edit]- )+ [edit],+ );return (<div>@@ -996,25 +1014,25 @@ const OrderEditBody = ({ edit }: { edit: AdminOrderChange }) => {</Text>)}</div>- )-}+ );+};const TransferOrderRequestBody = ({transfer,}: {- transfer: AdminOrderChange+ transfer: AdminOrderChange;}) => {- const prompt = usePrompt()- const { t } = useTranslation()+ const prompt = usePrompt();+ const { t } = useTranslation();- const action = transfer.actions[0]- const { customer } = useCustomer(action.reference_id)+ const action = transfer.actions[0];+ const { customer } = useCustomer(action.reference_id);- const isCompleted = !!transfer.confirmed_at+ const isCompleted = !!transfer.confirmed_at;const { mutateAsync: cancelTransfer } = useCancelOrderTransfer(- transfer.order_id- )+ transfer.order_id,+ );const handleDelete = async () => {const res = await prompt({@@ -1022,16 +1040,16 @@ const TransferOrderRequestBody = ({description: t("actions.cannotUndo"),confirmText: t("actions.delete"),cancelText: t("actions.cancel"),- })+ });if (!res) {- return+ return;}await cancelTransfer().catch((error) => {- toast.error(error.message)- })- }+ toast.error(error.message);+ });+ };/*** TODO: change original_email to customer info when action details is changed@@ -1060,32 +1078,32 @@ const TransferOrderRequestBody = ({</Button>)}</div>- )-}+ );+};/*** Returns count of added and removed item quantity*/function countItemsChange(actions: AdminOrderChange["actions"]) {- let added = 0- let removed = 0+ let added = 0;+ let removed = 0;actions.forEach((action) => {if (action.action === "ITEM_ADD") {- added += action.details!.quantity as number+ added += action.details!.quantity as number;}if (action.action === "ITEM_UPDATE") {- const quantityDiff = action.details!.quantity_diff as number+ const quantityDiff = action.details!.quantity_diff as number;if (quantityDiff > 0) {- added += quantityDiff+ added += quantityDiff;} else {- removed += Math.abs(quantityDiff)+ removed += Math.abs(quantityDiff);}}- })+ });- return [added, removed]+ return [added, removed];}/**@@ -1093,26 +1111,26 @@ function countItemsChange(actions: AdminOrderChange["actions"]) {*/function getMissingLineItemIds(order: AdminOrder, changes: AdminOrderChange[]) {if (!changes?.length) {- return []+ return [];}- const retIds = new Set<string>()- const existingItemsMap = new Map(order.items.map((item) => [item.id, true]))+ const retIds = new Set<string>();+ const existingItemsMap = new Map(order.items.map((item) => [item.id, true]));changes.forEach((change) => {change.actions.forEach((action) => {if (!action.details?.reference_id) {- return+ return;}if ((action.details.reference_id as string).startsWith("ordli_") &&!existingItemsMap.has(action.details.reference_id as string)) {- retIds.add(action.details.reference_id as string)+ retIds.add(action.details.reference_id as string);}- })- })+ });+ });- return Array.from(retIds)+ return Array.from(retIds);}diff --git a/packages/registry/package.json b/packages/registry/package.jsonindex 3f3f3228d..945b74516 100644--- a/packages/registry/package.json+++ b/packages/registry/package.json@@ -29,7 +29,8 @@"@hookform/resolvers": "3.4.2","jsonwebtoken": "9.0.2","react-jwt": "2.0.0",- "algoliasearch": "^5.40.0"+ "algoliasearch": "^5.40.0",+ "@talkjs/react": "^0.1.11"},"devDependencies": {"@mercurjs/types": "workspace:*",diff --git a/packages/registry/r/requests.json b/packages/registry/r/requests.jsonindex 496eacb53..1be1e1cbe 100644--- a/packages/registry/r/requests.json+++ b/packages/registry/r/requests.json@@ -217,7 +217,7 @@},{"path": "requests/admin/hooks/table/columns/use-request-table-columns.tsx",- "content": "import { createColumnHelper } from \"@tanstack/react-table\";\nimport { useMemo } from \"react\";\nimport { useTranslation } from \"react-i18next\";\nimport { StatusBadge, Text } from \"@medusajs/ui\";\nimport { DateCell, DateHeader } from \"@mercurjs/dashboard-shared\";\nimport { RequestDTO } from \"../../api/requests\";\n\nconst columnHelper = createColumnHelper<RequestDTO>();\n\nconst statusColor = (status: string) => {\n switch (status) {\n case \"accepted\":\n return \"green\" as const;\n case \"pending\":\n return \"orange\" as const;\n case \"rejected\":\n return \"red\" as const;\n default:\n return \"grey\" as const;\n }\n};\n\nexport const useRequestTableColumns = (nameKey: string = \"name\") => {\n const { t } = useTranslation();\n\n return useMemo(\n () => [\n columnHelper.display({\n id: \"display_name\",\n header: () => (\n <div className=\"flex h-full w-full items-center\">\n <span className=\"truncate\">Name</span>\n </div>\n ),\n cell: ({ row }) => (\n <Text size=\"small\" leading=\"compact\">\n {row.original[nameKey] ?? row.original.id}\n </Text>\n ),\n }),\n columnHelper.accessor(\"custom_fields\", {\n header: () => (\n <div className=\"flex h-full w-full items-center\">\n <span className=\"truncate\">Status</span>\n </div>\n ),\n cell: ({ getValue }) => {\n const customFields = getValue() as any;\n const status = customFields?.request_status ?? \"draft\";\n return (\n <StatusBadge color={statusColor(status)}>\n {status.charAt(0).toUpperCase() + status.slice(1)}\n </StatusBadge>\n );\n },\n }),\n columnHelper.accessor(\"created_at\", {\n header: () => <DateHeader />,\n cell: ({ getValue }) => {\n const date = new Date(getValue() as string);\n return <DateCell date={date} />;\n },\n }),\n ],\n [t, nameKey],\n );\n};\n",+ "content": "import { createColumnHelper } from \"@tanstack/react-table\";\nimport { useMemo } from \"react\";\nimport { useTranslation } from \"react-i18next\";\nimport { StatusBadge, Text } from \"@medusajs/ui\";\nimport { DateCell, DateHeader } from \"@mercurjs/dashboard-shared\";\nimport { RequestDTO } from \"../../api/requests\";\n\nconst columnHelper = createColumnHelper<RequestDTO>();\n\nconst statusColor = (status: string) => {\n switch (status) {\n case \"accepted\":\n return \"green\" as const;\n case \"pending\":\n return \"orange\" as const;\n case \"rejected\":\n return \"red\" as const;\n default:\n return \"grey\" as const;\n }\n};\n\nexport const useRequestTableColumns = (nameKey: string = \"name\") => {\n const { t } = useTranslation();\n\n return useMemo(\n () => [\n columnHelper.display({\n id: \"display_name\",\n header: () => (\n <div className=\"flex h-full w-full items-center\">\n <span className=\"truncate\">Name</span>\n </div>\n ),\n cell: ({ row }) => (\n <Text size=\"small\" leading=\"compact\">\n {(row.original[nameKey] as string) ?? row.original.id}\n </Text>\n ),\n }),\n columnHelper.accessor(\"custom_fields\", {\n header: () => (\n <div className=\"flex h-full w-full items-center\">\n <span className=\"truncate\">Status</span>\n </div>\n ),\n cell: ({ getValue }) => {\n const customFields = getValue() as any;\n const status = customFields?.request_status ?? \"draft\";\n return (\n <StatusBadge color={statusColor(status)}>\n {status.charAt(0).toUpperCase() + status.slice(1)}\n </StatusBadge>\n );\n },\n }),\n columnHelper.accessor(\"created_at\", {\n header: () => <DateHeader />,\n cell: ({ getValue }) => {\n const date = new Date(getValue() as string);\n return <DateCell date={date} />;\n },\n }),\n ],\n [t, nameKey],\n );\n};\n","type": "registry:admin"},{diff --git a/packages/registry/src/requests/admin/hooks/table/columns/use-request-table-columns.tsx b/packages/registry/src/requests/admin/hooks/table/columns/use-request-table-columns.tsxindex 0d6103243..e3b630d32 100644--- a/packages/registry/src/requests/admin/hooks/table/columns/use-request-table-columns.tsx+++ b/packages/registry/src/requests/admin/hooks/table/columns/use-request-table-columns.tsx@@ -34,7 +34,7 @@ export const useRequestTableColumns = (nameKey: string = "name") => {),cell: ({ row }) => (<Text size="small" leading="compact">- {row.original[nameKey] as string ?? row.original.id}+ {(row.original[nameKey] as string) ?? row.original.id}</Text>),}),