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
feat(campaigns): sync admin campaigns UI to design and add list filters (#1307)
Viktor Holik948d43dc9fae
diff --git a/integration-tests/http/campaigns/admin/campaigns.spec.ts b/integration-tests/http/campaigns/admin/campaigns.spec.tsnew file mode 100644index 000000000..76255c92e--- /dev/null+++ b/integration-tests/http/campaigns/admin/campaigns.spec.ts@@ -0,0 +1,209 @@+import { medusaIntegrationTestRunner } from "@medusajs/test-utils"+import { MedusaContainer } from "@medusajs/framework/types"+import {+ createAdminUser,+ adminHeaders,+} from "../../../helpers/create-admin-user"+import { createSellerUser } from "../../../helpers/create-seller-user"++jest.setTimeout(60000)++const DAY = 24 * 60 * 60 * 1000++medusaIntegrationTestRunner({+ testSuite: ({ getContainer, api, dbConnection }) => {+ describe("Admin - Campaigns", () => {+ let appContainer: MedusaContainer++ beforeAll(async () => {+ appContainer = getContainer()+ await createAdminUser(dbConnection, adminHeaders, appContainer)+ })++ it("exposes the owning seller on a store campaign and none on a platform campaign", async () => {+ const { seller, headers } = await createSellerUser(appContainer, {+ email: "[email protected]",+ name: "Owner Store",+ })++ const storeCampaign = (+ await api.post(+ `/vendor/campaigns`,+ { name: "Store Campaign", campaign_identifier: "store-owner-1" },+ headers+ )+ ).data.campaign++ const platformCampaign = (+ await api.post(+ `/admin/campaigns`,+ { name: "Platform Campaign", campaign_identifier: "platform-owner-1" },+ adminHeaders+ )+ ).data.campaign++ const storeDetail = await api.get(+ `/admin/campaigns/${storeCampaign.id}?fields=%2Bseller.id,%2Bseller.name`,+ adminHeaders+ )+ expect(storeDetail.status).toEqual(200)+ expect(storeDetail.data.campaign.seller?.id).toEqual(seller.id)+ expect(storeDetail.data.campaign.seller?.name).toEqual("Owner Store")++ const platformDetail = await api.get(+ `/admin/campaigns/${platformCampaign.id}?fields=%2Bseller.id,%2Bseller.name`,+ adminHeaders+ )+ expect(platformDetail.status).toEqual(200)+ expect(platformDetail.data.campaign.seller ?? null).toBeNull()+ })++ it("filters campaigns by owning seller and by platform owner", async () => {+ const { seller, headers } = await createSellerUser(appContainer, {+ email: "[email protected]",+ name: "Filter Store",+ })++ const storeCampaign = (+ await api.post(+ `/vendor/campaigns`,+ { name: "Store Filter", campaign_identifier: "store-filter-1" },+ headers+ )+ ).data.campaign++ const platformCampaign = (+ await api.post(+ `/admin/campaigns`,+ { name: "Platform Filter", campaign_identifier: "platform-filter-1" },+ adminHeaders+ )+ ).data.campaign++ const bySeller = await api.get(+ `/admin/campaigns?seller_id=${seller.id}`,+ adminHeaders+ )+ expect(bySeller.status).toEqual(200)+ const sellerIds = bySeller.data.campaigns.map((c: { id: string }) => c.id)+ expect(sellerIds).toContain(storeCampaign.id)+ expect(sellerIds).not.toContain(platformCampaign.id)++ const byPlatform = await api.get(+ `/admin/campaigns?seller_id=platform`,+ adminHeaders+ )+ expect(byPlatform.status).toEqual(200)+ const platformIds = byPlatform.data.campaigns.map(+ (c: { id: string }) => c.id+ )+ expect(platformIds).toContain(platformCampaign.id)+ expect(platformIds).not.toContain(storeCampaign.id)+ })++ it("filters campaigns by budget type", async () => {+ const usageCampaign = (+ await api.post(+ `/admin/campaigns`,+ {+ name: "Usage Budget",+ campaign_identifier: "budget-usage-1",+ budget: { type: "usage", limit: 100 },+ },+ adminHeaders+ )+ ).data.campaign++ const spendCampaign = (+ await api.post(+ `/admin/campaigns`,+ {+ name: "Spend Budget",+ campaign_identifier: "budget-spend-1",+ budget: { type: "spend", limit: 1000, currency_code: "usd" },+ },+ adminHeaders+ )+ ).data.campaign++ const usageOnly = await api.get(+ `/admin/campaigns?budget_type=usage`,+ adminHeaders+ )+ expect(usageOnly.status).toEqual(200)+ const usageIds = usageOnly.data.campaigns.map((c: { id: string }) => c.id)+ expect(usageIds).toContain(usageCampaign.id)+ expect(usageIds).not.toContain(spendCampaign.id)+ })++ it("filters campaigns by computed status", async () => {+ const expiredCampaign = (+ await api.post(+ `/admin/campaigns`,+ {+ name: "Expired",+ campaign_identifier: "status-expired-1",+ starts_at: new Date(Date.now() - 10 * DAY).toISOString(),+ ends_at: new Date(Date.now() - 5 * DAY).toISOString(),+ },+ adminHeaders+ )+ ).data.campaign++ const scheduledCampaign = (+ await api.post(+ `/admin/campaigns`,+ {+ name: "Scheduled",+ campaign_identifier: "status-scheduled-1",+ starts_at: new Date(Date.now() + 5 * DAY).toISOString(),+ ends_at: new Date(Date.now() + 10 * DAY).toISOString(),+ },+ adminHeaders+ )+ ).data.campaign++ const activeCampaign = (+ await api.post(+ `/admin/campaigns`,+ {+ name: "Active",+ campaign_identifier: "status-active-1",+ starts_at: new Date(Date.now() - 5 * DAY).toISOString(),+ ends_at: new Date(Date.now() + 5 * DAY).toISOString(),+ },+ adminHeaders+ )+ ).data.campaign++ const expired = await api.get(+ `/admin/campaigns?status=expired`,+ adminHeaders+ )+ const expiredIds = expired.data.campaigns.map((c: { id: string }) => c.id)+ expect(expiredIds).toContain(expiredCampaign.id)+ expect(expiredIds).not.toContain(scheduledCampaign.id)+ expect(expiredIds).not.toContain(activeCampaign.id)++ const scheduled = await api.get(+ `/admin/campaigns?status=scheduled`,+ adminHeaders+ )+ const scheduledIds = scheduled.data.campaigns.map(+ (c: { id: string }) => c.id+ )+ expect(scheduledIds).toContain(scheduledCampaign.id)+ expect(scheduledIds).not.toContain(expiredCampaign.id)++ const active = await api.get(+ `/admin/campaigns?status=active`,+ adminHeaders+ )+ const activeIds = active.data.campaigns.map((c: { id: string }) => c.id)+ expect(activeIds).toContain(activeCampaign.id)+ expect(activeIds).not.toContain(expiredCampaign.id)+ expect(activeIds).not.toContain(scheduledCampaign.id)+ })+ })+ },+})diff --git a/packages/admin/src/components/search/search.tsx b/packages/admin/src/components/search/search.tsxindex fbebc4fa5..443a615aa 100644--- a/packages/admin/src/components/search/search.tsx+++ b/packages/admin/src/components/search/search.tsx@@ -567,7 +567,7 @@ const CommandItem = forwardRef<<Command.Itemref={ref}className={clx(- "aria-selected:bg-ui-bg-base-hover focus-visible:bg-ui-bg-base-hover txt-compact-small [&>svg]:text-ui-fg-subtle relative flex cursor-pointer select-none items-center gap-x-3 rounded-md p-2 outline-none data-[disabled]:pointer-events-none data-[disabled]:cursor-not-allowed data-[disabled]:opacity-50",+ "aria-selected:bg-ui-bg-base-hover focus-visible:bg-ui-bg-base-hover txt-compact-small [&>svg]:text-ui-fg-subtle relative flex cursor-pointer select-none items-center gap-x-3 rounded-md p-2 outline-none data-[disabled=true]:pointer-events-none data-[disabled=true]:cursor-not-allowed data-[disabled=true]:opacity-50",className,)}{...props}diff --git a/packages/admin/src/components/table/data-table/data-table-filter/select-filter.tsx b/packages/admin/src/components/table/data-table/data-table-filter/select-filter.tsxindex f31e45a4b..7f7a4703d 100644--- a/packages/admin/src/components/table/data-table/data-table-filter/select-filter.tsx+++ b/packages/admin/src/components/table/data-table/data-table-filter/select-filter.tsx@@ -171,7 +171,7 @@ export const SelectFilter = ({return (<Command.Itemkey={String(option.value)}- className="bg-ui-bg-base hover:bg-ui-bg-base-hover aria-selected:bg-ui-bg-base-pressed focus-visible:bg-ui-bg-base-pressed text-ui-fg-base data-[disabled]:text-ui-fg-disabled txt-compact-small relative flex cursor-pointer select-none items-center gap-x-2 rounded-md px-2 py-1.5 outline-none transition-colors data-[disabled]:pointer-events-none"+ className="bg-ui-bg-base hover:bg-ui-bg-base-hover aria-selected:bg-ui-bg-base-pressed focus-visible:bg-ui-bg-base-pressed text-ui-fg-base data-[disabled=true]:text-ui-fg-disabled txt-compact-small relative flex cursor-pointer select-none items-center gap-x-2 rounded-md px-2 py-1.5 outline-none transition-colors data-[disabled=true]:pointer-events-none"value={option.label}onSelect={() => {handleSelect(option.value)diff --git a/packages/admin/src/extension-targets.d.ts b/packages/admin/src/extension-targets.d.tsindex 330923a5b..187c5a4ca 100644--- a/packages/admin/src/extension-targets.d.ts+++ b/packages/admin/src/extension-targets.d.ts@@ -191,7 +191,7 @@ declare module "@mercurjs/dashboard-sdk" {formZones: "edit"formTabs: Record<string, string>displayZones: "configuration" | "general" | "promotions"- displayFieldIds: "campaign_identifier" | "currency_code" | "description" | "name" | "status"+ displayFieldIds: "campaign_identifier" | "description" | "name" | "owner" | "status"}"category": {formZones: "create" | "edit"diff --git a/packages/admin/src/hooks/table/columns/use-campaign-table-columns.tsx b/packages/admin/src/hooks/table/columns/use-campaign-table-columns.tsxindex 9259a5f29..04a222d73 100644--- a/packages/admin/src/hooks/table/columns/use-campaign-table-columns.tsx+++ b/packages/admin/src/hooks/table/columns/use-campaign-table-columns.tsx@@ -1,6 +1,8 @@import { createColumnHelper } from "@tanstack/react-table"import { AdminCampaign } from "@medusajs/types"+import { StatusBadge } from "@medusajs/ui"+import { SellerDTO } from "@mercurjs/types"import { useMemo } from "react"import { useTranslation } from "react-i18next"import { DateCell } from "../../../components/table/table-cells/common/date-cell"@@ -16,6 +18,10 @@ import {NameCell,NameHeader,} from "../../../components/table/table-cells/sales-channel/name-cell"+import {+ campaignStatus,+ statusColor,+} from "../../../pages/campaigns/common/utils/campaign-status"const columnHelper = createColumnHelper<AdminCampaign>()@@ -39,6 +45,36 @@ export const useCampaignTableColumns = () => {return <TextCell text={value} />},}),+ columnHelper.display({+ id: "type",+ header: () => <TextHeader text={t("campaigns.fields.type")} />,+ cell: ({ row }) => {+ const type = row.original.budget?.type++ if (!type) {+ return <TextCell text="-" />+ }++ return <TextCell text={t(`campaigns.budget.type.${type}.title`)} />+ },+ }),+ columnHelper.display({+ id: "owner",+ header: () => <TextHeader text={t("campaigns.fields.owner")} />,+ cell: ({ row }) => {+ const campaign = row.original as AdminCampaign & {+ seller?: Pick<SellerDTO, "name"> | null+ }++ return (+ <TextCell+ text={+ campaign.seller?.name ?? t("campaigns.fields.platformOwner")+ }+ />+ )+ },+ }),columnHelper.accessor("starts_at", {header: () => <TextHeader text={t("campaigns.fields.start_date")} />,cell: ({ getValue }) => {@@ -67,6 +103,19 @@ export const useCampaignTableColumns = () => {return <DateCell date={date} />},}),+ columnHelper.display({+ id: "status",+ header: () => <TextHeader text={t("fields.status")} />,+ cell: ({ row }) => {+ const status = campaignStatus(row.original)++ return (+ <StatusBadge color={statusColor(status)}>+ {t(`campaigns.status.${status}`)}+ </StatusBadge>+ )+ },+ }),],[t])diff --git a/packages/admin/src/hooks/table/columns/use-promotion-table-columns.tsx b/packages/admin/src/hooks/table/columns/use-promotion-table-columns.tsxindex ecd6630df..5c949fd1a 100644--- a/packages/admin/src/hooks/table/columns/use-promotion-table-columns.tsx+++ b/packages/admin/src/hooks/table/columns/use-promotion-table-columns.tsx@@ -17,11 +17,19 @@ import { getPromotionType } from "../../../lib/promotions"const columnHelper = createColumnHelper<HttpTypes.AdminPromotion>()-export const usePromotionTableColumns = () => {+type UsePromotionTableColumnsOptions = {+ exclude?: string[]+ order?: string[]+}++export const usePromotionTableColumns = ({+ exclude,+ order,+}: UsePromotionTableColumnsOptions = {}) => {const { t } = useTranslation()- return useMemo(- () => [+ return useMemo(() => {+ const columns = [columnHelper.display({id: "code",header: () => <CodeHeader text={t("fields.code")} />,@@ -77,7 +85,24 @@ export const usePromotionTableColumns = () => {header: () => <TextHeader text={t("fields.status")} />,cell: ({ row }) => <StatusCell promotion={row.original} />,}),- ],- [t]- )+ ]++ const filtered = exclude?.length+ ? columns.filter((column) => !exclude.includes(column.id as string))+ : columns++ if (!order?.length) {+ return filtered+ }++ return [...filtered].sort((a, b) => {+ const aIndex = order.indexOf(a.id as string)+ const bIndex = order.indexOf(b.id as string)++ return (+ (aIndex === -1 ? order.length : aIndex) -+ (bIndex === -1 ? order.length : bIndex)+ )+ })+ }, [t, exclude, order])}diff --git a/packages/admin/src/hooks/table/filters/use-campaign-table-filters.tsx b/packages/admin/src/hooks/table/filters/use-campaign-table-filters.tsxnew file mode 100644index 000000000..0e7121505--- /dev/null+++ b/packages/admin/src/hooks/table/filters/use-campaign-table-filters.tsx@@ -0,0 +1,55 @@+import { useMemo } from "react"+import { useTranslation } from "react-i18next"++import { Filter } from "../../../components/table/data-table"+import { useSellers } from "../../api/sellers"++export const useCampaignTableFilters = (): Filter[] => {+ const { t } = useTranslation()++ const { sellers } = useSellers({ limit: 100, fields: "id,name" })++ return useMemo(() => {+ const typeFilter: Filter = {+ key: "budget_type",+ label: t("campaigns.fields.type"),+ type: "select",+ options: [+ { label: t("campaigns.budget.type.usage.title"), value: "usage" },+ { label: t("campaigns.budget.type.spend.title"), value: "spend" },+ ],+ }++ const ownerFilter: Filter = {+ key: "seller_id",+ label: t("campaigns.fields.owner"),+ type: "select",+ searchable: true,+ options: [+ { label: t("campaigns.fields.platformOwner"), value: "platform" },+ ...(sellers ?? []).map((seller) => ({+ label: seller.name!,+ value: seller.id,+ })),+ ],+ }++ const statusFilter: Filter = {+ key: "status",+ label: t("fields.status"),+ type: "select",+ options: [+ { label: t("campaigns.status.active"), value: "active" },+ { label: t("campaigns.status.expired"), value: "expired" },+ { label: t("campaigns.status.scheduled"), value: "scheduled" },+ ],+ }++ const dateFilters: Filter[] = [+ { label: t("fields.createdAt"), key: "created_at", type: "date" },+ { label: t("fields.updatedAt"), key: "updated_at", type: "date" },+ ]++ return [typeFilter, ownerFilter, statusFilter, ...dateFilters]+ }, [t, sellers])+}diff --git a/packages/admin/src/hooks/table/query/use-campaign-table-query.tsx b/packages/admin/src/hooks/table/query/use-campaign-table-query.tsxindex d7951431b..fea73c94c 100644--- a/packages/admin/src/hooks/table/query/use-campaign-table-query.tsx+++ b/packages/admin/src/hooks/table/query/use-campaign-table-query.tsx@@ -10,17 +10,40 @@ export const useCampaignTableQuery = ({pageSize = 20,}: UseCampaignTableQueryProps) => {const queryObject = useQueryParams(- ["offset", "q", "order", "created_at", "updated_at"],+ [+ "offset",+ "q",+ "order",+ "created_at",+ "updated_at",+ "seller_id",+ "budget_type",+ "status",+ ],prefix)- const { offset, q, order, created_at, updated_at } = queryObject+ const {+ offset,+ q,+ order,+ created_at,+ updated_at,+ seller_id,+ budget_type,+ status,+ } = queryObject+const searchParams = {limit: pageSize,offset: offset ? Number(offset) : 0,order,+ fields: "+seller.id,+seller.name,+budget.type",created_at: created_at ? JSON.parse(created_at) : undefined,updated_at: updated_at ? JSON.parse(updated_at) : undefined,+ seller_id: seller_id || undefined,+ budget_type: budget_type || undefined,+ status: status || undefined,q,}diff --git a/packages/admin/src/i18n/translations/en.json b/packages/admin/src/i18n/translations/en.jsonindex d3672657b..0856cce6a 100644--- a/packages/admin/src/i18n/translations/en.json+++ b/packages/admin/src/i18n/translations/en.json@@ -2626,21 +2626,23 @@"scheduled": "Scheduled"},"delete": {- "title": "Are you sure?",- "description": "You are about to delete the campaign '{{name}}'. This action cannot be undone.",- "successToast": "Campaign '{{name}}' was successfully deleted."+ "title": "Delete campaign",+ "description": "You are about to delete a campaign {{name}}. This action cannot be undone.",+ "successToast": "Campaign was successfully deleted."},"edit": {"header": "Edit Campaign","description": "Edit the details of the campaign.",- "successToast": "Campaign '{{name}}' was successfully updated."+ "successToast": "Campaign was successfully updated."},"configuration": {"header": "Configuration",+ "expiryWarningLabel": "Warning",+ "expiryWarning": "The promotion will expire when campaign expires.","edit": {"header": "Edit Campaign Configuration","description": "Edit the configuration of the campaign.",- "successToast": "Campaign configuration was successfully updated."+ "successToast": "Campaign was successfully updated."}},"create": {@@ -2648,25 +2650,37 @@"description": "Create a promotional campaign.","hint": "Create a promotional campaign.","header": "Create Campaign",- "successToast": "Campaign '{{name}}' was successfully created."+ "successToast": "Campaign was successfully created."+ },+ "validation": {+ "nameRequired": "Please enter a name",+ "identifierRequired": "Please enter an identifier",+ "currencyRequired": "Please select a currency"},"fields": {"name": "Name","identifier": "Identifier",+ "identifierTooltip": "The identifier is your business-friendly campaign code that you use for integrations, reporting, and easily recognizing the campaign – it is not the technical ID from the database.","start_date": "Start date","end_date": "End date","total_spend": "Budget spent","total_used": "Budget used","totalUsedByAttribute": "Total used","budget_limit": "Budget limit",+ "type": "Type",+ "owner": "Owner",+ "platformOwner": "Mercur",+ "budget_used": "Budget used","campaign_id": {"hint": "Disabled campaigns have budget in a different currency than the promotion."}},"budget": {+ "title": "Budget","create": {"hint": "Create a budget for the campaign.",- "header": "Campaign Budget"+ "header": "Campaign Budget",+ "noLimitHint": "If you don't set any limits, the campaign budget will have no limit."},"details": "Campaign budget","fields": {@@ -2676,6 +2690,7 @@"used": "Used","budgetAttribute": "Limit usage per","budgetAttributeTooltip": "Define how many times the promotion can be used by a specific customer or email.",+ "noLimit": "No limit","totalUsedByAttribute": "Budget limit per: {{attribute}}"},"type": {@@ -2698,22 +2713,27 @@},"promotions": {"remove": {- "title": "Remove promotion from campaign",- "description": "You are about to remove {{count}} promotion(s) from the campaign. This action cannot be undone."+ "title": "Remove promotions",+ "description": "You are about to remove {{count}} promotions from campaign. This action cannot be undone."},"alreadyAdded": "This promotion has already been added to the campaign.","alreadyAddedDiffCampaign": "This promotion has already been added to a different campaign ({{name}}).","currencyMismatch": "Currency of the promotion and campaign doesn't match","toast": {- "success": "Successfully added {{count}} promotion(s) to campaign"+ "success": "Promotion was successfully added to campaign.",+ "removed_one": "Promotion was successfully removed from campaign.",+ "removed_other": "Promotions were successfully removed from campaign."},"add": {+ "tipLabel": "Tip:",+ "tip": "You can only add promotions that aren't already assigned to another campaign.","list": {"noRecordsMessage": "Create a promotion first."}},"list": {- "noRecordsMessage": "There are no promotions in the campaign."+ "noRecordsTitle": "No promotions yet",+ "noRecordsMessage": "This campaign doesn't have any promotions"}},"deleteCampaignWarning": "You are about to delete the campaign {{name}}. This action cannot be undone.",diff --git a/packages/admin/src/pages/campaigns/add-campaign-promotions/components/add-campaign-promotions-form.tsx b/packages/admin/src/pages/campaigns/add-campaign-promotions/components/add-campaign-promotions-form.tsxindex 6a62b7712..a67a6b8db 100644--- a/packages/admin/src/pages/campaigns/add-campaign-promotions/components/add-campaign-promotions-form.tsx+++ b/packages/admin/src/pages/campaigns/add-campaign-promotions/components/add-campaign-promotions-form.tsx@@ -1,6 +1,6 @@import { zodResolver } from "@hookform/resolvers/zod"import { AdminCampaign, HttpTypes } from "@medusajs/types"-import { Button, Checkbox, Hint, Tooltip, toast } from "@medusajs/ui"+import { Button, Checkbox, Hint, Text, Tooltip, toast } from "@medusajs/ui"import { keepPreviousData } from "@tanstack/react-query"import {OnChangeFn,@@ -96,11 +96,7 @@ export const AddCampaignPromotionsForm = ({{ add: values.promotion_ids },{onSuccess: () => {- toast.success(- t("campaigns.promotions.toast.success", {- count: values.promotion_ids.length,- })- )+ toast.success(t("campaigns.promotions.toast.success"))handleSuccess()},onError: (error) => toast.error(error.message),@@ -148,15 +144,29 @@ export const AddCampaignPromotionsForm = ({/></RouteFocusModal.Body><RouteFocusModal.Footer data-testid="campaign-add-promotions-form-footer">- <div className="flex items-center justify-end gap-x-2">- <RouteFocusModal.Close asChild>+ <div className="flex flex-1 items-center justify-between gap-x-2">+ <Text+ className="text-ui-fg-subtle border-ui-border-strong border-l-2 ps-3"+ size="small"+ leading="compact"+ data-testid="campaign-add-promotions-form-tip"+ >+ <span className="text-ui-fg-base txt-compact-small-plus">+ {t("campaigns.promotions.add.tipLabel")}+ </span>{" "}+ {t("campaigns.promotions.add.tip")}+ </Text>++ <div className="flex items-center gap-x-2">+ <RouteFocusModal.Close asChild><Button size="small" variant="secondary" data-testid="campaign-add-promotions-form-cancel-button">{t("actions.cancel")}</Button></RouteFocusModal.Close>- <Button size="small" type="submit" isLoading={isPending} data-testid="campaign-add-promotions-form-save-button">- {t("actions.save")}- </Button>+ <Button size="small" type="submit" isLoading={isPending} data-testid="campaign-add-promotions-form-save-button">+ {t("actions.save")}+ </Button>+ </div></div></RouteFocusModal.Footer></KeyboundForm>@@ -167,7 +177,10 @@ export const AddCampaignPromotionsForm = ({const columnHelper = createColumnHelper<HttpTypes.AdminPromotion>()const useColumns = () => {- const base = usePromotionTableColumns()+ const base = usePromotionTableColumns({+ exclude: ["campaign"],+ order: ["code", "method", "owner", "type", "status"],+ })const { t } = useTranslation()return useMemo(diff --git a/packages/admin/src/pages/campaigns/campaign-budget-edit/components/edit-campaign-budget-form/edit-campaign-budget-form.tsx b/packages/admin/src/pages/campaigns/campaign-budget-edit/components/edit-campaign-budget-form/edit-campaign-budget-form.tsxindex 3ca8840e4..d4a5cb013 100644--- a/packages/admin/src/pages/campaigns/campaign-budget-edit/components/edit-campaign-budget-form/edit-campaign-budget-form.tsx+++ b/packages/admin/src/pages/campaigns/campaign-budget-edit/components/edit-campaign-budget-form/edit-campaign-budget-form.tsx@@ -41,12 +41,8 @@ export const EditCampaignBudgetForm = ({},},{- onSuccess: ({ campaign }) => {- toast.success(- t("campaigns.edit.successToast", {- name: campaign.name,- })- )+ onSuccess: () => {+ toast.success(t("campaigns.edit.successToast"))handleSuccess()},@@ -68,7 +64,7 @@ export const EditCampaignBudgetForm = ({render={({ field: { onChange, value, ...field } }) => {return (<Form.Item className="basis-1/2" data-testid="campaign-edit-budget-form-limit-item">- <Form.Label data-testid="campaign-edit-budget-form-limit-label">+ <Form.Label optional data-testid="campaign-edit-budget-form-limit-label">{t("campaigns.budget.fields.limit")}</Form.Label>diff --git a/packages/admin/src/pages/campaigns/campaign-configuration/components/campaign-configuration-form/campaign-configuration-form.tsx b/packages/admin/src/pages/campaigns/campaign-configuration/components/campaign-configuration-form/campaign-configuration-form.tsxindex c9543515c..6c6206252 100644--- a/packages/admin/src/pages/campaigns/campaign-configuration/components/campaign-configuration-form/campaign-configuration-form.tsx+++ b/packages/admin/src/pages/campaigns/campaign-configuration/components/campaign-configuration-form/campaign-configuration-form.tsx@@ -42,12 +42,8 @@ export const CampaignConfigurationForm = ({ends_at: data.ends_at || null,},{- onSuccess: ({ campaign }) => {- toast.success(- t("campaigns.configuration.edit.successToast", {- name: campaign.name,- })- )+ onSuccess: () => {+ toast.success(t("campaigns.configuration.edit.successToast"))handleSuccess()},@@ -69,7 +65,7 @@ export const CampaignConfigurationForm = ({render={({ field }) => {return (<Form.Item data-testid="campaign-configuration-form-starts-at-item">- <Form.Label data-testid="campaign-configuration-form-starts-at-label">{t("campaigns.fields.start_date")}</Form.Label>+ <Form.Label optional data-testid="campaign-configuration-form-starts-at-label">{t("campaigns.fields.start_date")}</Form.Label><Form.Control data-testid="campaign-configuration-form-starts-at-control"><DatePicker@@ -93,7 +89,7 @@ export const CampaignConfigurationForm = ({render={({ field }) => {return (<Form.Item data-testid="campaign-configuration-form-ends-at-item">- <Form.Label data-testid="campaign-configuration-form-ends-at-label">{t("campaigns.fields.end_date")}</Form.Label>+ <Form.Label optional data-testid="campaign-configuration-form-ends-at-label">{t("campaigns.fields.end_date")}</Form.Label><Form.Control data-testid="campaign-configuration-form-ends-at-control"><DatePickerdiff --git a/packages/admin/src/pages/campaigns/campaign-create/components/create-campaign-form/create-campaign-form.tsx b/packages/admin/src/pages/campaigns/campaign-create/components/create-campaign-form/create-campaign-form.tsxindex 918959ab2..8049aebdc 100644--- a/packages/admin/src/pages/campaigns/campaign-create/components/create-campaign-form/create-campaign-form.tsx+++ b/packages/admin/src/pages/campaigns/campaign-create/components/create-campaign-form/create-campaign-form.tsx@@ -1,5 +1,6 @@import { zodResolver } from "@hookform/resolvers/zod"import { Button, toast } from "@medusajs/ui"+import i18n from "i18next"import { useForm } from "react-hook-form"import { useTranslation } from "react-i18next"import * as zod from "zod"@@ -14,19 +15,33 @@ import { useCreateCampaign } from "../../../../../hooks/api/campaigns"import { CreateCampaignFormFields } from "../../../common/components/create-campaign-form-fields"import { DEFAULT_CAMPAIGN_VALUES } from "../../../common/constants"-export const CreateCampaignSchema = zod.object({- name: zod.string().min(1),- description: zod.string().optional(),- campaign_identifier: zod.string().min(1),- starts_at: zod.date().nullable(),- ends_at: zod.date().nullable(),- budget: zod.object({- attribute: zod.string().nullish(),- limit: zod.number().min(0).nullish(),- type: zod.enum(["spend", "usage", "use_by_attribute"]),- currency_code: zod.string().nullish(),- }),-})+export const CreateCampaignSchema = zod+ .object({+ name: zod+ .string()+ .min(1, { message: i18n.t("campaigns.validation.nameRequired") }),+ description: zod.string().optional(),+ campaign_identifier: zod+ .string()+ .min(1, { message: i18n.t("campaigns.validation.identifierRequired") }),+ starts_at: zod.date().nullable(),+ ends_at: zod.date().nullable(),+ budget: zod.object({+ attribute: zod.string().nullish(),+ limit: zod.number().min(0).nullish(),+ type: zod.enum(["spend", "usage", "use_by_attribute"]),+ currency_code: zod.string().nullish(),+ }),+ })+ .superRefine((data, ctx) => {+ if (data.budget.type === "spend" && !data.budget.currency_code) {+ ctx.addIssue({+ code: zod.ZodIssueCode.custom,+ message: i18n.t("campaigns.validation.currencyRequired"),+ path: ["budget", "currency_code"],+ })+ }+ })export const CreateCampaignForm = () => {const { t } = useTranslation()@@ -59,11 +74,7 @@ export const CreateCampaignForm = () => {},{onSuccess: ({ campaign }) => {- toast.success(- t("campaigns.create.successToast", {- name: campaign.name,- })- )+ toast.success(t("campaigns.create.successToast"))handleSuccess(`/campaigns/${campaign.id}`)},onError: (error) => {diff --git a/packages/admin/src/pages/campaigns/campaign-detail/campaign-detail.tsx b/packages/admin/src/pages/campaigns/campaign-detail/campaign-detail.tsxindex 4257d441c..78b9e5841 100644--- a/packages/admin/src/pages/campaigns/campaign-detail/campaign-detail.tsx+++ b/packages/admin/src/pages/campaigns/campaign-detail/campaign-detail.tsx@@ -9,7 +9,6 @@ import { CampaignBudget } from "./components/campaign-budget"import { CampaignConfigurationSection } from "./components/campaign-configuration-section"import { CampaignGeneralSection } from "./components/campaign-general-section"import { CampaignPromotionSection } from "./components/campaign-promotion-section"-import { CampaignSpend } from "./components/campaign-spend"import { campaignLoader } from "./loader"import { CAMPAIGN_DETAIL_FIELDS } from "./constants"@@ -30,7 +29,7 @@ const Root = ({ children }: { children?: ReactNode }) => {return (<TwoColumnPageSkeletonmainSections={2}- sidebarSections={3}+ sidebarSections={2}showJSONshowMetadata/>@@ -56,7 +55,6 @@ const Root = ({ children }: { children?: ReactNode }) => {<TwoColumnPage.Sidebar><WidgetZone id="campaigns.detail.side" data={campaign}><CampaignConfigurationSection campaign={campaign} />- <CampaignSpend campaign={campaign} /><CampaignBudget campaign={campaign} /></WidgetZone></TwoColumnPage.Sidebar>@@ -70,6 +68,5 @@ export const CampaignDetailPage = Object.assign(Root, {MainGeneralSection: CampaignGeneralSection,MainPromotionSection: CampaignPromotionSection,SidebarConfigurationSection: CampaignConfigurationSection,- SidebarSpendSection: CampaignSpend,SidebarBudgetSection: CampaignBudget,})diff --git a/packages/admin/src/pages/campaigns/campaign-detail/components/campaign-budget/campaign-budget.tsx b/packages/admin/src/pages/campaigns/campaign-detail/components/campaign-budget/campaign-budget.tsxindex 38d21c692..15a9b8fa0 100644--- a/packages/admin/src/pages/campaigns/campaign-detail/components/campaign-budget/campaign-budget.tsx+++ b/packages/admin/src/pages/campaigns/campaign-detail/components/campaign-budget/campaign-budget.tsx@@ -1,85 +1,163 @@-import { ChartPie, PencilSquare } from "@medusajs/icons"+import { ChartPie, CurrencyDollar, PencilSquare } from "@medusajs/icons"import { AdminCampaign } from "@medusajs/types"import { Container, Heading, Text } from "@medusajs/ui"-import { Trans, useTranslation } from "react-i18next"+import { useTranslation } from "react-i18next"import { ActionMenu } from "../../../../../components/common/action-menu"type CampaignBudgetProps = {campaign: AdminCampaign}+type BudgetPill = {+ label: string+ value: string+ testId: string+ editTo?: string+}++const BudgetPills = ({ pills }: { pills: BudgetPill[] }) => {+ const { t } = useTranslation()++ return (+ <div className="overflow-hidden rounded-xl border border-ui-border-base">+ {pills.map((pill, index) => (+ <div+ key={pill.testId}+ className={+ index < pills.length - 1 ? "border-b border-ui-border-base" : ""+ }+ >+ <div+ className="grid grid-cols-[minmax(0,1fr)_minmax(0,1fr)_28px] items-center gap-4 bg-ui-bg-component px-3 py-2"+ data-testid={pill.testId}+ >+ <Text+ size="small"+ weight="plus"+ leading="compact"+ className="text-ui-fg-subtle"+ >+ {pill.label}+ </Text>++ <Text+ size="small"+ leading="compact"+ className="text-ui-fg-subtle"+ >+ {pill.value}+ </Text>++ {pill.editTo ? (+ <ActionMenu+ groups={[+ {+ actions: [+ {+ icon: <PencilSquare />,+ label: t("actions.edit"),+ to: pill.editTo,+ },+ ],+ },+ ]}+ data-testid={`${pill.testId}-action-menu`}+ />+ ) : (+ <span />+ )}+ </div>+ </div>+ ))}+ </div>+ )+}++const ATTRIBUTE_LABEL_KEYS: Record<string, string> = {+ customer_id: "fields.customer",+ customer_email: "fields.email",+ promotion_code: "fields.promotionCode",+}+export const CampaignBudget = ({ campaign }: CampaignBudgetProps) => {const { t } = useTranslation()+ const budget = campaign.budget+ const isSpend = budget?.type === "spend"+ const currency = isSpend ? ` ${budget?.currency_code?.toUpperCase()}` : ""++ const usedValue = `${budget?.used ?? 0}${currency}`+ const limitValue = budget?.limit+ ? `${budget.limit}${currency}`+ : t("campaigns.budget.fields.noLimit")++ const attributeKey = budget?.attribute+ ? ATTRIBUTE_LABEL_KEYS[budget.attribute]+ : undefined++ const pills: BudgetPill[] = [+ {+ label: t("campaigns.fields.budget_used"),+ value: usedValue,+ testId: "campaign-budget-used",+ },+ {+ label: t("campaigns.fields.budget_limit"),+ value: limitValue,+ testId: "campaign-budget-limit",+ editTo: "edit-budget",+ },+ ]++ if (!isSpend) {+ pills.push({+ label: t("campaigns.budget.fields.budgetAttribute"),+ value: attributeKey ? t(attributeKey) : "-",+ testId: "campaign-budget-attribute",+ })+ }+return (- <Container className="flex flex-col gap-y-4 px-6 py-4" data-testid="campaign-budget-container">- <div className="flex justify-between" data-testid="campaign-budget-header">- <div className="flex-grow">- <div className="bg-ui-bg-base shadow-borders-base float-start flex size-7 items-center justify-center rounded-md" data-testid="campaign-budget-icon-container">+ <Container className="p-0" data-testid="campaign-budget-container">+ <div+ className="flex items-center justify-between px-6 py-4"+ data-testid="campaign-budget-header"+ >+ <Heading level="h2" data-testid="campaign-budget-heading">+ {t("campaigns.budget.title")}+ </Heading>+ </div>++ <div className="flex flex-col gap-y-4">+ <div+ className="flex items-center gap-x-3 px-6"+ data-testid="campaign-budget-subtitle"+ >+ <div className="bg-ui-bg-base shadow-borders-base flex size-7 items-center justify-center rounded-md"><div className="bg-ui-bg-component flex size-6 items-center justify-center rounded-[4px]">- <ChartPie className="text-ui-fg-subtle" />+ {isSpend ? (+ <CurrencyDollar className="text-ui-fg-subtle" />+ ) : (+ <ChartPie className="text-ui-fg-subtle" />+ )}</div></div>- <Heading- className="text-ui-fg-subtle ms-10 mt-[1.5px] font-normal"- level="h3"- data-testid="campaign-budget-heading"- >- {campaign.budget?.type === "use_by_attribute"- ? t("campaigns.budget.fields.totalUsedByAttribute", {- attribute: campaign.budget?.attribute,- })- : t("campaigns.fields.budget_limit")}- </Heading>+ <div>+ <Text size="small" leading="compact" weight="plus">+ {t(`campaigns.budget.type.${isSpend ? "spend" : "usage"}.title`)}+ </Text>+ <Text size="small" leading="compact" className="text-ui-fg-subtle">+ {t(+ `campaigns.budget.type.${isSpend ? "spend" : "usage"}.description`+ )}+ </Text>+ </div></div>- <ActionMenu- groups={[- {- actions: [- {- icon: <PencilSquare />,- label: t("actions.edit"),- to: `edit-budget`,- },- ],- },- ]}- data-testid="campaign-budget-action-menu"- />- </div>-- <div data-testid="campaign-budget-limit">- <Text- className="text-ui-fg-subtle border-ui-border-strong border-l-4 ps-3"- size="small"- leading="compact"- data-testid="campaign-budget-limit-text"- >- <Trans- i18nKey="campaigns.totalSpend"- values={{- amount: campaign?.budget?.limit || "no limit",- currency:- campaign?.budget?.type === "spend" && campaign?.budget.limit- ? campaign.budget?.currency_code- : "",- }}- components={[- <span- key="amount"- className="text-ui-fg-base txt-compact-medium-plus text-lg"- data-testid="campaign-budget-limit-amount"- />,- <span- key="currency"- className="text-ui-fg-base txt-compact-medium-plus text-lg"- data-testid="campaign-budget-limit-currency"- />,- ]}- />- </Text>+ <div className="px-3 pb-3">+ <BudgetPills pills={pills} />+ </div></div></Container>)diff --git a/packages/admin/src/pages/campaigns/campaign-detail/components/campaign-configuration-section/campaign-configuration-section.tsx b/packages/admin/src/pages/campaigns/campaign-detail/components/campaign-configuration-section/campaign-configuration-section.tsxindex 01f431204..9fb13e300 100644--- a/packages/admin/src/pages/campaigns/campaign-detail/components/campaign-configuration-section/campaign-configuration-section.tsx+++ b/packages/admin/src/pages/campaigns/campaign-detail/components/campaign-configuration-section/campaign-configuration-section.tsx@@ -1,5 +1,5 @@import { HttpTypes } from "@medusajs/types"-import { Container, Heading } from "@medusajs/ui"+import { Container, Heading, InlineTip } from "@medusajs/ui"import { PencilSquare } from "@medusajs/icons"import { useTranslation } from "react-i18next"@@ -17,8 +17,8 @@ export const CampaignConfigurationSection = ({const { t } = useTranslation()return (- <Container className="flex flex-col gap-y-4" data-testid="campaign-configuration-section-container">- <div className="flex items-center justify-between" data-testid="campaign-configuration-section-header">+ <Container className="flex flex-col gap-y-4 p-0" data-testid="campaign-configuration-section-container">+ <div className="flex items-center justify-between px-6 pt-6" data-testid="campaign-configuration-section-header"><Heading level="h2" data-testid="campaign-configuration-section-heading">{t("campaigns.configuration.header")}</Heading><ActionMenugroups={[@@ -35,12 +35,23 @@ export const CampaignConfigurationSection = ({data-testid="campaign-configuration-section-action-menu"/></div>- <DateRangeDisplay- startsAt={campaign.starts_at}- endsAt={campaign.ends_at}- showTime- data-testid="campaign-configuration-section-date-range"- />++ <div className="flex flex-col gap-y-4 px-3 pb-3">+ <DateRangeDisplay+ startsAt={campaign.starts_at}+ endsAt={campaign.ends_at}+ showTime+ data-testid="campaign-configuration-section-date-range"+ />++ <InlineTip+ variant="warning"+ label={t("campaigns.configuration.expiryWarningLabel")}+ data-testid="campaign-configuration-section-expiry-warning"+ >+ {t("campaigns.configuration.expiryWarning")}+ </InlineTip>+ </div><DisplayExtensionZonemodel="campaign"diff --git a/packages/admin/src/pages/campaigns/campaign-detail/components/campaign-general-section/campaign-general-section.tsx b/packages/admin/src/pages/campaigns/campaign-detail/components/campaign-general-section/campaign-general-section.tsxindex 5b3d8a7ba..380f3367e 100644--- a/packages/admin/src/pages/campaigns/campaign-detail/components/campaign-general-section/campaign-general-section.tsx+++ b/packages/admin/src/pages/campaigns/campaign-detail/components/campaign-general-section/campaign-general-section.tsx@@ -1,7 +1,6 @@import { PencilSquare, Trash } from "@medusajs/icons"import { AdminCampaignResponse } from "@medusajs/types"import {- Badge,Container,Heading,StatusBadge,@@ -14,7 +13,6 @@ import { useNavigate } from "react-router-dom"import { DisplayExtensionZone, DisplayField } from "@mercurjs/dashboard-shared"import { ActionMenu } from "../../../../../components/common/action-menu"import { useDeleteCampaign } from "../../../../../hooks/api/campaigns"-import { currencies } from "../../../../../lib/data/currencies"import {campaignStatus,statusColor,@@ -25,11 +23,13 @@ const GENERAL_FIELD_IDS = ["status","campaign_identifier","description",- "currency_code",+ "owner",]type CampaignGeneralSectionProps = {- campaign: AdminCampaignResponse["campaign"]+ campaign: AdminCampaignResponse["campaign"] & {+ seller?: { name?: string } | null+ }}export const CampaignGeneralSection = ({@@ -56,11 +56,7 @@ export const CampaignGeneralSection = ({await mutateAsync(undefined, {onSuccess: () => {- toast.success(- t("campaigns.delete.successToast", {- name: campaign.name,- })- )+ toast.success(t("campaigns.delete.successToast"))navigate("/campaigns", { replace: true })},@@ -112,6 +108,18 @@ export const CampaignGeneralSection = ({</div></div>+ <DisplayField model="campaign" zone="general" id="description" data={campaign}>+ <div className="text-ui-fg-subtle grid grid-cols-2 items-center px-6 py-4" data-testid="campaign-general-section-description">+ <Text size="small" leading="compact" weight="plus" data-testid="campaign-general-section-description-label">+ {t("fields.description")}+ </Text>++ <Text size="small" leading="compact" data-testid="campaign-general-section-description-value">+ {campaign.description || "-"}+ </Text>+ </div>+ </DisplayField>+<DisplayField model="campaign" zone="general" id="campaign_identifier" data={campaign}><div className="text-ui-fg-subtle grid grid-cols-2 items-center px-6 py-4" data-testid="campaign-general-section-identifier"><Text size="small" leading="compact" weight="plus" data-testid="campaign-general-section-identifier-label">@@ -124,35 +132,18 @@ export const CampaignGeneralSection = ({</div></DisplayField>- <DisplayField model="campaign" zone="general" id="description" data={campaign}>- <div className="text-ui-fg-subtle grid grid-cols-2 items-center px-6 py-4" data-testid="campaign-general-section-description">- <Text size="small" leading="compact" weight="plus" data-testid="campaign-general-section-description-label">- {t("fields.description")}+ <DisplayField model="campaign" zone="general" id="owner" data={campaign}>+ <div className="text-ui-fg-subtle grid grid-cols-2 items-center px-6 py-4" data-testid="campaign-general-section-owner">+ <Text size="small" leading="compact" weight="plus" data-testid="campaign-general-section-owner-label">+ {t("campaigns.fields.owner")}</Text>- <Text size="small" leading="compact" data-testid="campaign-general-section-description-value">- {campaign.description || "-"}+ <Text size="small" leading="compact" data-testid="campaign-general-section-owner-value">+ {campaign.seller?.name ?? t("campaigns.fields.platformOwner")}</Text></div></DisplayField>- {campaign?.budget && campaign.budget.type === "spend" && (- <DisplayField model="campaign" zone="general" id="currency_code" data={campaign}>- <div className="text-ui-fg-subtle grid grid-cols-2 items-center px-6 py-4" data-testid="campaign-general-section-currency">- <Text size="small" leading="compact" weight="plus" data-testid="campaign-general-section-currency-label">- {t("fields.currency")}- </Text>-- <div data-testid="campaign-general-section-currency-value">- <Badge size="xsmall" data-testid="campaign-general-section-currency-badge">{campaign?.budget.currency_code}</Badge>- <Text className="inline pl-3" size="small" leading="compact" data-testid="campaign-general-section-currency-name">- {currencies[campaign?.budget.currency_code?.toUpperCase()]?.name}- </Text>- </div>- </div>- </DisplayField>- )}-<DisplayExtensionZonemodel="campaign"zone="general"diff --git a/packages/admin/src/pages/campaigns/campaign-detail/components/campaign-promotion-section/campaign-promotion-section.tsx b/packages/admin/src/pages/campaigns/campaign-detail/components/campaign-promotion-section/campaign-promotion-section.tsxindex 4dc316831..c57d6e0f6 100644--- a/packages/admin/src/pages/campaigns/campaign-detail/components/campaign-promotion-section/campaign-promotion-section.tsx+++ b/packages/admin/src/pages/campaigns/campaign-detail/components/campaign-promotion-section/campaign-promotion-section.tsx@@ -1,6 +1,13 @@import { PencilSquare, Trash } from "@medusajs/icons"import { AdminCampaign, AdminPromotion } from "@medusajs/types"-import { Button, Checkbox, Container, Heading, usePrompt } from "@medusajs/ui"+import {+ Button,+ Checkbox,+ Container,+ Heading,+ toast,+ usePrompt,+} from "@medusajs/ui"import { RowSelectionState, createColumnHelper } from "@tanstack/react-table"import { useMemo, useState } from "react"import { useTranslation } from "react-i18next"@@ -65,7 +72,7 @@ export const CampaignPromotionSection = ({description: t("campaigns.promotions.remove.description", {count: keys.length,}),- confirmText: t("actions.continue"),+ confirmText: t("actions.remove"),cancelText: t("actions.cancel"),})@@ -75,7 +82,15 @@ export const CampaignPromotionSection = ({await mutateAsync({ remove: keys },- { onSuccess: () => setRowSelection({}) }+ {+ onSuccess: () => {+ toast.success(+ t("campaigns.promotions.toast.removed", { count: keys.length })+ )+ setRowSelection({})+ },+ onError: (err) => toast.error(err.message),+ })}@@ -115,6 +130,7 @@ export const CampaignPromotionSection = ({},]}noRecords={{+ title: t("campaigns.promotions.list.noRecordsTitle"),message: t("campaigns.promotions.list.noRecordsMessage"),}}data-testid="campaign-promotion-section-table"@@ -145,7 +161,7 @@ const PromotionActions = ({description: t("campaigns.promotions.remove.description", {count: 1,}),- confirmText: t("actions.continue"),+ confirmText: t("actions.remove"),cancelText: t("actions.cancel"),})@@ -153,9 +169,18 @@ const PromotionActions = ({return}- await mutateAsync({- remove: [promotion.id],- })+ await mutateAsync(+ {+ remove: [promotion.id],+ },+ {+ onSuccess: () =>+ toast.success(+ t("campaigns.promotions.toast.removed", { count: 1 })+ ),+ onError: (error) => toast.error(error.message),+ }+ )}return (@@ -188,7 +213,10 @@ const PromotionActions = ({const columnHelper = createColumnHelper<AdminPromotion>()const useColumns = () => {- const columns = usePromotionTableColumns()+ const columns = usePromotionTableColumns({+ exclude: ["campaign"],+ order: ["code", "method", "type", "owner", "status"],+ })return useMemo(() => [diff --git a/packages/admin/src/pages/campaigns/campaign-detail/components/campaign-spend/campaign-spend.tsx b/packages/admin/src/pages/campaigns/campaign-detail/components/campaign-spend/campaign-spend.tsxdeleted file mode 100644index 8be124297..000000000--- a/packages/admin/src/pages/campaigns/campaign-detail/components/campaign-spend/campaign-spend.tsx+++ /dev/null@@ -1,64 +0,0 @@-import { CurrencyDollar } from "@medusajs/icons"-import { AdminCampaign } from "@medusajs/types"-import { Container, Heading, Text } from "@medusajs/ui"-import { Trans, useTranslation } from "react-i18next"--type CampaignSpendProps = {- campaign: AdminCampaign-}--export const CampaignSpend = ({ campaign }: CampaignSpendProps) => {- const { t } = useTranslation()-- return (- <Container className="flex flex-col gap-y-4 px-6 py-4" data-testid="campaign-spend-container">- <div className="mb-2 grid grid-cols-[28px_1fr] items-center gap-x-3" data-testid="campaign-spend-header">- <div className="bg-ui-bg-base shadow-borders-base flex size-7 items-center justify-center rounded-md" data-testid="campaign-spend-icon-container">- <div className="bg-ui-bg-component flex size-6 items-center justify-center rounded-[4px]">- <CurrencyDollar className="text-ui-fg-subtle" />- </div>- </div>-- <Heading level="h3" className="text-ui-fg-subtle font-normal" data-testid="campaign-spend-heading">- {campaign.budget?.type === "use_by_attribute"- ? t("campaigns.fields.totalUsedByAttribute")- : campaign.budget?.type === "spend"- ? t("campaigns.fields.total_spend")- : t("campaigns.fields.total_used")}- </Heading>- </div>-- <div data-testid="campaign-spend-value">- <Text- className="text-ui-fg-subtle border-ui-border-strong border-l-4 pl-3"- size="small"- leading="compact"- data-testid="campaign-spend-value-text"- >- <Trans- i18nKey="campaigns.totalSpend"- values={{- amount: campaign?.budget?.used || 0,- currency:- campaign?.budget?.type === "spend"- ? campaign?.budget?.currency_code- : "",- }}- components={[- <span- key="amount"- className="text-ui-fg-base txt-compact-medium-plus text-lg"- data-testid="campaign-spend-value-amount"- />,- <span- key="currency"- className="text-ui-fg-base txt-compact-medium-plus text-lg"- data-testid="campaign-spend-value-currency"- />,- ]}- />- </Text>- </div>- </Container>- )-}diff --git a/packages/admin/src/pages/campaigns/campaign-detail/components/campaign-spend/index.ts b/packages/admin/src/pages/campaigns/campaign-detail/components/campaign-spend/index.tsdeleted file mode 100644index a2cb55ae2..000000000--- a/packages/admin/src/pages/campaigns/campaign-detail/components/campaign-spend/index.ts+++ /dev/null@@ -1 +0,0 @@-export * from "./campaign-spend"diff --git a/packages/admin/src/pages/campaigns/campaign-detail/constants.ts b/packages/admin/src/pages/campaigns/campaign-detail/constants.tsindex d449a2d44..45025e2e7 100644--- a/packages/admin/src/pages/campaigns/campaign-detail/constants.ts+++ b/packages/admin/src/pages/campaigns/campaign-detail/constants.ts@@ -1 +1 @@-export const CAMPAIGN_DETAIL_FIELDS = "+promotions.id"+export const CAMPAIGN_DETAIL_FIELDS = "+promotions.id,+seller.name"diff --git a/packages/admin/src/pages/campaigns/campaign-edit/components/edit-campaign-form/edit-campaign-form.tsx b/packages/admin/src/pages/campaigns/campaign-edit/components/edit-campaign-form/edit-campaign-form.tsxindex 431f80143..5af99945b 100644--- a/packages/admin/src/pages/campaigns/campaign-edit/components/edit-campaign-form/edit-campaign-form.tsx+++ b/packages/admin/src/pages/campaigns/campaign-edit/components/edit-campaign-form/edit-campaign-form.tsx@@ -1,5 +1,5 @@import { AdminCampaign } from "@medusajs/types"-import { Button, DatePicker, Input, toast } from "@medusajs/ui"+import { Button, Input, toast } from "@medusajs/ui"import { useTranslation } from "react-i18next"import * as zod from "zod"import {@@ -19,8 +19,6 @@ const EditCampaignSchema = zod.object({name: zod.string(),description: zod.string().optional(),campaign_identifier: zod.string().optional(),- starts_at: zod.date().optional(),- ends_at: zod.date().optional(),})export const EditCampaignForm = ({ campaign }: EditCampaignFormProps) => {@@ -36,8 +34,6 @@ export const EditCampaignForm = ({ campaign }: EditCampaignFormProps) => {name: campaign.name || "",description: campaign.description || "",campaign_identifier: campaign.campaign_identifier || "",- starts_at: campaign.starts_at ? new Date(campaign.starts_at) : undefined,- ends_at: campaign.ends_at ? new Date(campaign.ends_at) : undefined,},})@@ -49,16 +45,10 @@ export const EditCampaignForm = ({ campaign }: EditCampaignFormProps) => {name: data.name,description: data.description,campaign_identifier: data.campaign_identifier,- starts_at: data.starts_at,- ends_at: data.ends_at,},{- onSuccess: ({ campaign }) => {- toast.success(- t("campaigns.edit.successToast", {- name: campaign.name,- })- )+ onSuccess: () => {+ toast.success(t("campaigns.edit.successToast"))handleSuccess()},@@ -92,24 +82,6 @@ export const EditCampaignForm = ({ campaign }: EditCampaignFormProps) => {}}/>- <Form.Field- control={form.control}- name="description"- render={({ field }) => {- return (- <Form.Item data-testid="campaign-edit-form-description-item">- <Form.Label data-testid="campaign-edit-form-description-label">{t("fields.description")}</Form.Label>-- <Form.Control data-testid="campaign-edit-form-description-control">- <Input {...field} data-testid="campaign-edit-form-description-input" />- </Form.Control>-- <Form.ErrorMessage data-testid="campaign-edit-form-description-error" />- </Form.Item>- )- }}- />-<Form.Fieldcontrol={form.control}name="campaign_identifier"@@ -130,46 +102,17 @@ export const EditCampaignForm = ({ campaign }: EditCampaignFormProps) => {<Form.Fieldcontrol={form.control}- name="starts_at"+ name="description"render={({ field }) => {return (- <Form.Item data-testid="campaign-edit-form-starts-at-item">- <Form.Label data-testid="campaign-edit-form-starts-at-label">{t("campaigns.fields.start_date")}</Form.Label>-- <Form.Control data-testid="campaign-edit-form-starts-at-control">- <DatePicker- granularity="minute"- hourCycle={12}- shouldCloseOnSelect={false}- {...field}- data-testid="campaign-edit-form-starts-at-input"- />- </Form.Control>-- <Form.ErrorMessage data-testid="campaign-edit-form-starts-at-error" />- </Form.Item>- )- }}- />+ <Form.Item data-testid="campaign-edit-form-description-item">+ <Form.Label optional data-testid="campaign-edit-form-description-label">{t("fields.description")}</Form.Label>- <Form.Field- control={form.control}- name="ends_at"- render={({ field }) => {- return (- <Form.Item data-testid="campaign-edit-form-ends-at-item">- <Form.Label data-testid="campaign-edit-form-ends-at-label">{t("campaigns.fields.end_date")}</Form.Label>-- <Form.Control data-testid="campaign-edit-form-ends-at-control">- <DatePicker- granularity="minute"- shouldCloseOnSelect={false}- {...field}- data-testid="campaign-edit-form-ends-at-input"- />+ <Form.Control data-testid="campaign-edit-form-description-control">+ <Input {...field} data-testid="campaign-edit-form-description-input" /></Form.Control>- <Form.ErrorMessage data-testid="campaign-edit-form-ends-at-error" />+ <Form.ErrorMessage data-testid="campaign-edit-form-description-error" /></Form.Item>)}}diff --git a/packages/admin/src/pages/campaigns/campaign-list/components/campaign-list-table.tsx b/packages/admin/src/pages/campaigns/campaign-list/components/campaign-list-table.tsxindex ea0594d4f..726980e35 100644--- a/packages/admin/src/pages/campaigns/campaign-list/components/campaign-list-table.tsx+++ b/packages/admin/src/pages/campaigns/campaign-list/components/campaign-list-table.tsx@@ -14,6 +14,7 @@ import {useDeleteCampaign,} from "../../../../hooks/api/campaigns"import { useCampaignTableColumns } from "../../../../hooks/table/columns/use-campaign-table-columns"+import { useCampaignTableFilters } from "../../../../hooks/table/filters/use-campaign-table-filters"import { useCampaignTableQuery } from "../../../../hooks/table/query/use-campaign-table-query"import { useDataTable } from "../../../../hooks/use-data-table"@@ -68,7 +69,8 @@ export const CampaignListHeader = ({ children }: { children?: ReactNode }) => {export const CampaignListDataTable = () => {const { t } = useTranslation()const { raw, searchParams } = useCampaignTableQuery({ pageSize: PAGE_SIZE })- const linkQuery = useLinkQuery("campaign")+ const filters = useCampaignTableFilters()+ const linkQuery = useLinkQuery("campaign", searchParams.fields)const {campaigns,@@ -106,6 +108,7 @@ export const CampaignListDataTable = () => {pageSize={PAGE_SIZE}paginationsearch+ filters={filters}navigateTo={(row) => row.id}isLoading={isLoading}queryObject={raw}@@ -142,12 +145,10 @@ const CampaignActions = ({ campaign }: { campaign: AdminCampaign }) => {const handleDelete = async () => {const confirm = await prompt({- title: t("general.areYouSure"),- description: t("campaigns.deleteCampaignWarning", {+ title: t("campaigns.delete.title"),+ description: t("campaigns.delete.description", {name: campaign.name,}),- verificationInstruction: t("general.typeToConfirm"),- verificationText: campaign.name,confirmText: t("actions.delete"),cancelText: t("actions.cancel"),})@@ -158,9 +159,7 @@ const CampaignActions = ({ campaign }: { campaign: AdminCampaign }) => {await mutateAsync(undefined, {onSuccess: () => {- toast.success(- t("campaigns.delete.successToast", { name: campaign.name })- )+ toast.success(t("campaigns.delete.successToast"))},onError: (e) => {toast.error(e.message)diff --git a/packages/admin/src/pages/campaigns/common/components/create-campaign-form-fields/create-campaign-form-fields.tsx b/packages/admin/src/pages/campaigns/common/components/create-campaign-form-fields/create-campaign-form-fields.tsxindex b31c7f98e..e739d882f 100644--- a/packages/admin/src/pages/campaigns/common/components/create-campaign-form-fields/create-campaign-form-fields.tsx+++ b/packages/admin/src/pages/campaigns/common/components/create-campaign-form-fields/create-campaign-form-fields.tsx@@ -1,6 +1,7 @@import {CurrencyInput,DatePicker,+ Divider,Heading,Input,RadioGroup,@@ -107,7 +108,12 @@ export const CreateCampaignFormFields = ({ form, fieldScope = "" }) => {render={({ field }) => {return (<Form.Item data-testid="campaign-create-form-fields-identifier-item">- <Form.Label data-testid="campaign-create-form-fields-identifier-label">{t("campaigns.fields.identifier")}</Form.Label>+ <Form.Label+ tooltip={t("campaigns.fields.identifierTooltip")}+ data-testid="campaign-create-form-fields-identifier-label"+ >+ {t("campaigns.fields.identifier")}+ </Form.Label><Form.Control data-testid="campaign-create-form-fields-identifier-control"><Input {...field} data-testid="campaign-create-form-fields-identifier-input" />@@ -191,6 +197,8 @@ export const CreateCampaignFormFields = ({ form, fieldScope = "" }) => {/></div>+ <Divider variant="dashed" data-testid="campaign-create-form-fields-budget-divider" />+<div data-testid="campaign-create-form-fields-budget-header"><Heading data-testid="campaign-create-form-fields-budget-heading">{t("campaigns.budget.create.header")}</Heading><Text size="small" className="text-ui-fg-subtle" data-testid="campaign-create-form-fields-budget-hint">@@ -313,6 +321,7 @@ export const CreateCampaignFormFields = ({ form, fieldScope = "" }) => {return (<Form.Item className="basis-1/2" data-testid="campaign-create-form-fields-budget-limit-item"><Form.Label+ optionaltooltip={!currency && isTypeSpend? t("promotions.fields.amount.tooltip")@@ -371,6 +380,7 @@ export const CreateCampaignFormFields = ({ form, fieldScope = "" }) => {return (<Form.Item className="basis-1/2" data-testid="campaign-create-form-fields-budget-attribute-item"><Form.Label+ optionaltooltip={t("campaigns.budget.fields.budgetAttributeTooltip")}@@ -415,6 +425,14 @@ export const CreateCampaignFormFields = ({ form, fieldScope = "" }) => {/>)}</div>++ <Text+ size="small"+ className="text-ui-fg-subtle"+ data-testid="campaign-create-form-fields-budget-no-limit-hint"+ >+ {t("campaigns.budget.create.noLimitHint")}+ </Text></div>)}diff --git a/packages/core/src/api/admin/campaigns/helpers.ts b/packages/core/src/api/admin/campaigns/helpers.tsnew file mode 100644index 000000000..06629ca40--- /dev/null+++ b/packages/core/src/api/admin/campaigns/helpers.ts@@ -0,0 +1,179 @@+import {+ AuthenticatedMedusaRequest,+ MedusaNextFunction,+ MedusaResponse,+} from "@medusajs/framework/http"+import { ContainerRegistrationKeys } from "@medusajs/framework/utils"++const PLATFORM_OWNER = "platform"++type Filter = Record<string, unknown>++const buildStatusFilter = (status: string, now: Date): Filter | undefined => {+ switch (status) {+ case "expired":+ return { ends_at: { $lt: now } }+ case "scheduled":+ return {+ starts_at: { $gt: now },+ $or: [{ ends_at: null }, { ends_at: { $gte: now } }],+ }+ case "active":+ return {+ $and: [+ { $or: [{ starts_at: null }, { starts_at: { $lte: now } }] },+ { $or: [{ ends_at: null }, { ends_at: { $gte: now } }] },+ ],+ }+ default:+ return undefined+ }+}++export const applyCampaignFilters = async (+ req: AuthenticatedMedusaRequest,+ _res: MedusaResponse,+ next: MedusaNextFunction+) => {+ const filterableFields = req.filterableFields ?? {}++ const sellerId = filterableFields.seller_id as string | string[] | undefined+ const budgetType = filterableFields.budget_type as string | undefined+ const status = filterableFields.status as string | undefined++ delete filterableFields.seller_id+ delete filterableFields.budget_type+ delete filterableFields.status++ if (!sellerId && !budgetType && !status) {+ return next()+ }++ const query = req.scope.resolve(ContainerRegistrationKeys.QUERY)+ const constraints: Filter[] = []+ let noMatch = false++ // budget_type -> resolve to campaign ids through the campaign_budget table+ let budgetIds: string[] | undefined+ if (budgetType) {+ const { data } = await query.graph({+ entity: "campaign_budget",+ fields: ["campaign_id"],+ filters: { type: budgetType },+ })+ budgetIds = data.map((b: { campaign_id: string }) => b.campaign_id)+ if (!budgetIds.length) {+ noMatch = true+ }+ }++ // seller_id (incl. "platform" pseudo-owner) -> resolve through campaign_seller+ let sellerConstraint: Filter | undefined+ if (sellerId && !noMatch) {+ const requested = Array.isArray(sellerId) ? sellerId : [sellerId]+ const wantsPlatform = requested.includes(PLATFORM_OWNER)+ const requestedSellers = requested.filter((id) => id !== PLATFORM_OWNER)++ let sellerIds: string[] = []+ if (requestedSellers.length) {+ const { data } = await query.graph({+ entity: "campaign_seller",+ fields: ["campaign_id"],+ filters: { seller_id: requestedSellers },+ })+ sellerIds = data.map((l: { campaign_id: string }) => l.campaign_id)+ }++ let platformFilter: Filter | undefined+ if (wantsPlatform) {+ const { data } = await query.graph({+ entity: "campaign_seller",+ fields: ["campaign_id"],+ })+ const allLinkedIds = data.map((l: { campaign_id: string }) => l.campaign_id)+ platformFilter = allLinkedIds.length+ ? { id: { $nin: allLinkedIds } }+ : {}+ }++ const sellerFilter = requestedSellers.length+ ? { id: { $in: sellerIds } }+ : undefined++ if (sellerFilter && platformFilter) {+ // intersect budget with sellers below; platform is a disjoint branch+ sellerConstraint =+ Object.keys(platformFilter).length === 0+ ? sellerFilter+ : { $or: [sellerFilter, platformFilter] }+ } else if (sellerFilter) {+ if (!sellerIds.length) {+ noMatch = true+ } else {+ sellerConstraint = sellerFilter+ }+ } else if (platformFilter) {+ sellerConstraint = platformFilter+ }+ }++ // Intersect the two plain id allowlists (budget + real sellers) when possible+ // to keep the common path a single `id: { $in }` constraint.+ if (+ !noMatch &&+ budgetIds &&+ sellerConstraint &&+ isPlainInFilter(sellerConstraint)+ ) {+ const sellerIds = (sellerConstraint.id as { $in: string[] }).$in+ const budgetSet = new Set(budgetIds)+ const intersection = sellerIds.filter((id) => budgetSet.has(id))+ if (!intersection.length) {+ noMatch = true+ } else {+ constraints.push({ id: { $in: intersection } })+ }+ budgetIds = undefined+ sellerConstraint = undefined+ }++ if (!noMatch) {+ if (budgetIds) {+ constraints.push({ id: { $in: budgetIds } })+ }+ if (sellerConstraint) {+ constraints.push(sellerConstraint)+ }+ if (status) {+ const statusFilter = buildStatusFilter(status, new Date())+ if (statusFilter) {+ constraints.push(statusFilter)+ }+ }+ }++ if (noMatch) {+ filterableFields.id = ["__no_match__"]+ return next()+ }++ if (constraints.length) {+ const existingAnd = Array.isArray(filterableFields.$and)+ ? (filterableFields.$and as Filter[])+ : []+ filterableFields.$and = [...existingAnd, ...constraints]+ }++ return next()+}++const isPlainInFilter = (+ filter: Filter+): filter is { id: { $in: string[] } } => {+ const id = filter.id as { $in?: unknown } | undefined+ return (+ Object.keys(filter).length === 1 &&+ !!id &&+ Array.isArray((id as { $in?: unknown }).$in)+ )+}diff --git a/packages/core/src/api/admin/campaigns/middlewares.ts b/packages/core/src/api/admin/campaigns/middlewares.tsnew file mode 100644index 000000000..9ffa30406--- /dev/null+++ b/packages/core/src/api/admin/campaigns/middlewares.ts@@ -0,0 +1,53 @@+import { validateAndTransformQuery } from "@medusajs/framework"+import { MiddlewareRoute } from "@medusajs/framework/http"+import { listTransformQueryConfig } from "@medusajs/medusa/api/admin/campaigns/query-config"+import { AdminGetCampaignsParams } from "@medusajs/medusa/api/admin/campaigns/validators"+import { z } from "zod"++import { ORIGINAL_MIDDLEWARES } from "../../../utils/disable-medusa-middlewares"+import { applyCampaignFilters } from "./helpers"++const LIST_MATCHER = "/admin/campaigns"++const capturedBase = (ORIGINAL_MIDDLEWARES[+ "dist/api/admin/campaigns/middlewares.js"+] ?? []) as MiddlewareRoute[]++const routeHasGet = (route: MiddlewareRoute) => {+ const methods = Array.isArray(route.method)+ ? route.method+ : route.method+ ? [route.method]+ : []+ return methods.includes("GET")+}++const baseWithoutOverrides = capturedBase.filter((route) => {+ if (route.matcher === LIST_MATCHER && routeHasGet(route)) {+ return false+ }+ return true+})++const AdminGetCampaignsWithFilters = AdminGetCampaignsParams.merge(+ z.object({+ seller_id: z.union([z.string(), z.array(z.string())]).optional(),+ budget_type: z.string().optional(),+ status: z.enum(["active", "expired", "scheduled"]).optional(),+ })+)++export const adminCampaignsMiddlewares: MiddlewareRoute[] = [+ ...baseWithoutOverrides,+ {+ method: ["GET"],+ matcher: LIST_MATCHER,+ middlewares: [+ validateAndTransformQuery(+ AdminGetCampaignsWithFilters,+ listTransformQueryConfig+ ),+ applyCampaignFilters,+ ],+ },+]diff --git a/packages/core/src/api/admin/middlewares.ts b/packages/core/src/api/admin/middlewares.tsindex f9a5b25cf..b504dde83 100644--- a/packages/core/src/api/admin/middlewares.ts+++ b/packages/core/src/api/admin/middlewares.ts@@ -14,6 +14,7 @@ import { adminCommissionRatesMiddlewares } from "./commission-rates/middlewares"import { adminProductsMiddlewares } from "./products/middlewares"import { adminPromotionsMiddlewares } from "./promotions/middlewares"+import { adminCampaignsMiddlewares } from "./campaigns/middlewares"import { adminCollectionsMiddlewares } from "./collections/middlewares"import { adminProductCategoriesMiddlewares } from "./product-categories/middlewares"import { adminProductAttributesMiddlewares } from "./product-attributes/middlewares"@@ -43,6 +44,7 @@ export const adminMiddlewares: MiddlewareRoute[] = [...adminCommissionRatesMiddlewares,...adminProductsMiddlewares,...adminPromotionsMiddlewares,+ ...adminCampaignsMiddlewares,...adminCollectionsMiddlewares,...adminProductCategoriesMiddlewares,...adminProductAttributesMiddlewares,diff --git a/packages/core/src/utils/disable-medusa-middlewares.ts b/packages/core/src/utils/disable-medusa-middlewares.tsindex 89d9e54a1..79fa0f715 100644--- a/packages/core/src/utils/disable-medusa-middlewares.ts+++ b/packages/core/src/utils/disable-medusa-middlewares.ts@@ -26,6 +26,7 @@ import pkgDir from "pkg-dir"const OVERRIDES: string[] = ["dist/api/admin/products/middlewares.js","dist/api/admin/promotions/middlewares.js",+ "dist/api/admin/campaigns/middlewares.js","dist/api/admin/product-variants/middlewares.js","dist/api/admin/product-categories/middlewares.js","dist/api/admin/collections/middlewares.js",diff --git a/packages/dashboard-shared/src/components/table/data-table/data-table-filter/select-filter.tsx b/packages/dashboard-shared/src/components/table/data-table/data-table-filter/select-filter.tsxindex f31e45a4b..7f7a4703d 100644--- a/packages/dashboard-shared/src/components/table/data-table/data-table-filter/select-filter.tsx+++ b/packages/dashboard-shared/src/components/table/data-table/data-table-filter/select-filter.tsx@@ -171,7 +171,7 @@ export const SelectFilter = ({return (<Command.Itemkey={String(option.value)}- className="bg-ui-bg-base hover:bg-ui-bg-base-hover aria-selected:bg-ui-bg-base-pressed focus-visible:bg-ui-bg-base-pressed text-ui-fg-base data-[disabled]:text-ui-fg-disabled txt-compact-small relative flex cursor-pointer select-none items-center gap-x-2 rounded-md px-2 py-1.5 outline-none transition-colors data-[disabled]:pointer-events-none"+ className="bg-ui-bg-base hover:bg-ui-bg-base-hover aria-selected:bg-ui-bg-base-pressed focus-visible:bg-ui-bg-base-pressed text-ui-fg-base data-[disabled=true]:text-ui-fg-disabled txt-compact-small relative flex cursor-pointer select-none items-center gap-x-2 rounded-md px-2 py-1.5 outline-none transition-colors data-[disabled=true]:pointer-events-none"value={option.label}onSelect={() => {handleSelect(option.value)diff --git a/packages/vendor/src/components/search/search.tsx b/packages/vendor/src/components/search/search.tsxindex fbebc4fa5..443a615aa 100644--- a/packages/vendor/src/components/search/search.tsx+++ b/packages/vendor/src/components/search/search.tsx@@ -567,7 +567,7 @@ const CommandItem = forwardRef<<Command.Itemref={ref}className={clx(- "aria-selected:bg-ui-bg-base-hover focus-visible:bg-ui-bg-base-hover txt-compact-small [&>svg]:text-ui-fg-subtle relative flex cursor-pointer select-none items-center gap-x-3 rounded-md p-2 outline-none data-[disabled]:pointer-events-none data-[disabled]:cursor-not-allowed data-[disabled]:opacity-50",+ "aria-selected:bg-ui-bg-base-hover focus-visible:bg-ui-bg-base-hover txt-compact-small [&>svg]:text-ui-fg-subtle relative flex cursor-pointer select-none items-center gap-x-3 rounded-md p-2 outline-none data-[disabled=true]:pointer-events-none data-[disabled=true]:cursor-not-allowed data-[disabled=true]:opacity-50",className,)}{...props}diff --git a/packages/vendor/src/components/table/data-table/data-table-filter/select-filter.tsx b/packages/vendor/src/components/table/data-table/data-table-filter/select-filter.tsxindex f31e45a4b..7f7a4703d 100644--- a/packages/vendor/src/components/table/data-table/data-table-filter/select-filter.tsx+++ b/packages/vendor/src/components/table/data-table/data-table-filter/select-filter.tsx@@ -171,7 +171,7 @@ export const SelectFilter = ({return (<Command.Itemkey={String(option.value)}- className="bg-ui-bg-base hover:bg-ui-bg-base-hover aria-selected:bg-ui-bg-base-pressed focus-visible:bg-ui-bg-base-pressed text-ui-fg-base data-[disabled]:text-ui-fg-disabled txt-compact-small relative flex cursor-pointer select-none items-center gap-x-2 rounded-md px-2 py-1.5 outline-none transition-colors data-[disabled]:pointer-events-none"+ className="bg-ui-bg-base hover:bg-ui-bg-base-hover aria-selected:bg-ui-bg-base-pressed focus-visible:bg-ui-bg-base-pressed text-ui-fg-base data-[disabled=true]:text-ui-fg-disabled txt-compact-small relative flex cursor-pointer select-none items-center gap-x-2 rounded-md px-2 py-1.5 outline-none transition-colors data-[disabled=true]:pointer-events-none"value={option.label}onSelect={() => {handleSelect(option.value)