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(vendor-campaigns): detail polish, promotions filters & filtering refactor (#1316)
Viktor Holikd4f7dfec31bc
diff --git a/apps/vendor/src/_navigation.ts b/apps/vendor/src/_navigation.tsindex 0e5f452ee..3997f282c 100644--- a/apps/vendor/src/_navigation.ts+++ b/apps/vendor/src/_navigation.ts@@ -5,6 +5,5 @@ export default defineNavigationConfig({items: [{ id: "orders", rank: 0 },{ id: "price-lists", hidden: true },- { id: "campaigns", nested: "orders" },],})diff --git a/integration-tests/http/campaigns/vendor/campaigns.spec.ts b/integration-tests/http/campaigns/vendor/campaigns.spec.tsindex e22f08465..78c00d533 100644--- a/integration-tests/http/campaigns/vendor/campaigns.spec.ts+++ b/integration-tests/http/campaigns/vendor/campaigns.spec.ts@@ -529,6 +529,90 @@ medusaIntegrationTestRunner({expect(response.status).toEqual(400)})++ it("should keep seller scoping when filtering by budget_type", async () => {+ await api.post(+ `/vendor/campaigns`,+ {+ name: "Seller 1 Spend Campaign",+ campaign_identifier: "seller1-spend-scoped",+ budget: { type: "spend", limit: 1000, currency_code: "usd" },+ },+ seller1Headers+ )++ // seller2 filtering by the same budget type must not see seller1's campaign+ const response = await api.get(+ `/vendor/campaigns?budget_type=spend`,+ seller2Headers+ )++ expect(response.status).toEqual(200)+ expect(+ response.data.campaigns.every(+ (c: any) => c.campaign_identifier !== "seller1-spend-scoped"+ )+ ).toBe(true)+ })++ it("should combine budget_type and status filters", async () => {+ const past = new Date(Date.now() - 30 * 24 * 60 * 60 * 1000)+ const future = new Date(Date.now() + 30 * 24 * 60 * 60 * 1000)++ // active + spend -> should match+ await api.post(+ `/vendor/campaigns`,+ {+ name: "Active Spend Campaign",+ campaign_identifier: "active-spend-combo",+ starts_at: past.toISOString(),+ ends_at: future.toISOString(),+ budget: { type: "spend", limit: 1000, currency_code: "usd" },+ },+ seller1Headers+ )+ // active + usage -> excluded by budget_type+ await api.post(+ `/vendor/campaigns`,+ {+ name: "Active Usage Campaign",+ campaign_identifier: "active-usage-combo",+ starts_at: past.toISOString(),+ ends_at: future.toISOString(),+ budget: { type: "usage", limit: 10 },+ },+ seller1Headers+ )+ // scheduled + spend -> excluded by status+ await api.post(+ `/vendor/campaigns`,+ {+ name: "Scheduled Spend Campaign",+ campaign_identifier: "scheduled-spend-combo",+ starts_at: future.toISOString(),+ budget: { type: "spend", limit: 1000, currency_code: "usd" },+ },+ seller1Headers+ )++ const response = await api.get(+ `/vendor/campaigns?budget_type=spend&status=active`,+ seller1Headers+ )++ expect(response.status).toEqual(200)+ const identifiers = response.data.campaigns.map(+ (c: any) => c.campaign_identifier+ )+ expect(identifiers).toContain("active-spend-combo")+ expect(identifiers).not.toContain("active-usage-combo")+ expect(identifiers).not.toContain("scheduled-spend-combo")+ expect(+ response.data.campaigns.every(+ (c: any) => c.budget?.type === "spend"+ )+ ).toBe(true)+ })})})diff --git a/packages/core/src/api/vendor/campaigns/helpers.ts b/packages/core/src/api/vendor/campaigns/helpers.tsindex 765deb20a..11ddcd311 100644--- a/packages/core/src/api/vendor/campaigns/helpers.ts+++ b/packages/core/src/api/vendor/campaigns/helpers.ts@@ -1,9 +1,100 @@import { MedusaContainer } from "@medusajs/framework"+import {+ AuthenticatedMedusaRequest,+ MedusaNextFunction,+ MedusaResponse,+} from "@medusajs/framework/http"import {ContainerRegistrationKeys,MedusaError,} from "@medusajs/framework/utils"+type CampaignFilter = Record<string, unknown>++const buildStatusFilter = (+ status: string,+ now: Date+): CampaignFilter | 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+ }+}++/**+ * Translates the `budget_type` and `status` query params into real+ * `campaign` constraints, mirroring the admin campaigns middleware:+ * `budget_type` is resolved through the `campaign_budget` link (never a+ * nested relation filter) and `status` becomes a null-aware date range.+ * Both are appended to `$and` so the seller link filter is preserved.+ */+export const applyCampaignFilters = async (+ req: AuthenticatedMedusaRequest,+ _res: MedusaResponse,+ next: MedusaNextFunction+) => {+ const filterableFields = req.filterableFields ?? {}++ const budgetType = filterableFields.budget_type as string | undefined+ const status = filterableFields.status as string | undefined++ delete filterableFields.budget_type+ delete filterableFields.status++ if (!budgetType && !status) {+ return next()+ }++ const query = req.scope.resolve(ContainerRegistrationKeys.QUERY)+ const constraints: CampaignFilter[] = []++ if (budgetType) {+ const { data } = await query.graph({+ entity: "campaign_budget",+ fields: ["campaign_id"],+ filters: { type: budgetType },+ })+ const budgetIds = data.map((b: { campaign_id: string }) => b.campaign_id)++ if (!budgetIds.length) {+ filterableFields.id = ["__no_match__"]+ return next()+ }++ constraints.push({ id: { $in: budgetIds } })+ }++ if (status) {+ const statusFilter = buildStatusFilter(status, new Date())+ if (statusFilter) {+ constraints.push(statusFilter)+ }+ }++ if (constraints.length) {+ const existingAnd = Array.isArray(filterableFields.$and)+ ? (filterableFields.$and as CampaignFilter[])+ : []+ filterableFields.$and = [...existingAnd, ...constraints]+ }++ return next()+}+export const refetchCampaign = async (campaignId: string,scope: MedusaContainer,diff --git a/packages/core/src/api/vendor/campaigns/middlewares.ts b/packages/core/src/api/vendor/campaigns/middlewares.tsindex d1ee2b2d0..7d7e64cda 100644--- a/packages/core/src/api/vendor/campaigns/middlewares.ts+++ b/packages/core/src/api/vendor/campaigns/middlewares.ts@@ -11,6 +11,7 @@ import {} from "@medusajs/framework"import { createLinkBody } from "@medusajs/medusa/api/utils/validators"+import { applyCampaignFilters } from "./helpers"import { vendorCampaignQueryConfig } from "./query-config"import {VendorCreateCampaign,@@ -43,6 +44,7 @@ export const vendorCampaignsMiddlewares: MiddlewareRoute[] = [vendorCampaignQueryConfig.list),applySellerCampaignLinkFilter,+ applyCampaignFilters,],},{diff --git a/packages/core/src/api/vendor/campaigns/route.ts b/packages/core/src/api/vendor/campaigns/route.tsindex e2051f425..3eec88ce0 100644--- a/packages/core/src/api/vendor/campaigns/route.ts+++ b/packages/core/src/api/vendor/campaigns/route.ts@@ -12,52 +12,18 @@ import {VendorGetCampaignsParamsType,} from "./validators"-const buildStatusFilter = (status: "active" | "scheduled" | "expired") => {- const now = new Date()-- switch (status) {- case "expired":- return { ends_at: { $lt: now } }- case "scheduled":- return { starts_at: { $gt: now } }- case "active":- return {- $and: [- { $or: [{ starts_at: { $lte: now } }, { starts_at: null }] },- { $or: [{ ends_at: { $gte: now } }, { ends_at: null }] },- ],- }- }-}-export const GET = async (req: AuthenticatedMedusaRequest<VendorGetCampaignsParamsType>,res: MedusaResponse<HttpTypes.VendorCampaignListResponse>) => {const query = req.scope.resolve(ContainerRegistrationKeys.QUERY)- const { budget_type, status, ...filterableFields } = req.filterableFields as {- budget_type?: string- status?: "active" | "scheduled" | "expired"- } & Record<string, unknown>-- const filters: Record<string, unknown> = { ...filterableFields }-- if (budget_type) {- filters.budget = {- ...(filters.budget as Record<string, unknown> | undefined),- type: budget_type,- }- }-- if (status) {- Object.assign(filters, buildStatusFilter(status))- }-+ // `budget_type` / `status` are translated into real campaign constraints by+ // the `applyCampaignFilters` middleware; the handler just consumes filterableFields.const { data: campaigns, metadata } = await query.graph({entity: "campaign",fields: req.queryConfig.fields,- filters,+ filters: req.filterableFields,pagination: req.queryConfig.pagination,})diff --git a/packages/vendor/src/extension-targets.d.ts b/packages/vendor/src/extension-targets.d.tsindex 93f4692ac..6cddc7d34 100644--- a/packages/vendor/src/extension-targets.d.ts+++ b/packages/vendor/src/extension-targets.d.ts@@ -158,7 +158,7 @@ declare module "@mercurjs/dashboard-sdk" {formZones: "edit"formTabs: Record<string, string>displayZones: "budget" | "configuration" | "general" | "promotions" | "spend"- displayFieldIds: "campaign_identifier" | "currency_code" | "description" | "name" | "status"+ displayFieldIds: "campaign_identifier" | "description" | "name" | "status"}"category": {formZones: neverdiff --git a/packages/vendor/src/hooks/table/query/use-campaign-table-query.tsx b/packages/vendor/src/hooks/table/query/use-campaign-table-query.tsxindex 4912cc7c5..be7beb997 100644--- a/packages/vendor/src/hooks/table/query/use-campaign-table-query.tsx+++ b/packages/vendor/src/hooks/table/query/use-campaign-table-query.tsx@@ -19,7 +19,7 @@ export const useCampaignTableQuery = ({const searchParams = {limit: pageSize,offset: offset ? Number(offset) : 0,- order,+ order: order ?? "-created_at",created_at: created_at ? JSON.parse(created_at) : undefined,updated_at: updated_at ? JSON.parse(updated_at) : undefined,budget_type,diff --git a/packages/vendor/src/i18n/translations/en.json b/packages/vendor/src/i18n/translations/en.jsonindex 176fe789e..c2776b9ee 100644--- a/packages/vendor/src/i18n/translations/en.json+++ b/packages/vendor/src/i18n/translations/en.json@@ -2730,8 +2730,8 @@"scheduled": "Scheduled"},"delete": {- "title": "Are you sure?",- "description": "You are about to delete the campaign '{{name}}'. This action cannot be undone.",+ "title": "Delete campaign",+ "description": "You are about to delete a campaign {{name}}. This action cannot be undone.","successToast": "Campaign was successfully deleted."},"edit": {@@ -2786,10 +2786,11 @@"header": "Campaign Budget"},"noLimitHint": "If you don't set any limits, the campaign budget will have no limit.",- "details": "Campaign budget",+ "details": "Budget","fields": {"type": "Type","currency": "Currency",+ "selectCurrency": "Select currency","limit": "Limit","used": "Used","budgetAttribute": "Limit usage per",@@ -2824,7 +2825,7 @@},"promotions": {"remove": {- "title": "Remove promotion from campaign",+ "title": "Remove promotions","description": "You are about to remove {{count}} promotion(s) from the campaign. This action cannot be undone."},"alreadyAdded": "This promotion has already been added to the campaign.",@@ -2843,7 +2844,8 @@}},"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/vendor/src/pages/campaigns/[id]/_components/campaign-budget/campaign-budget.tsx b/packages/vendor/src/pages/campaigns/[id]/_components/campaign-budget/campaign-budget.tsxindex a942d9cfb..afbf498a8 100644--- a/packages/vendor/src/pages/campaigns/[id]/_components/campaign-budget/campaign-budget.tsx+++ b/packages/vendor/src/pages/campaigns/[id]/_components/campaign-budget/campaign-budget.tsx@@ -1,6 +1,7 @@-import { PencilSquare } from "@medusajs/icons"+import { ChartPie, CurrencyDollar, PencilSquare } from "@medusajs/icons"import { AdminCampaign } from "@medusajs/types"import { Container, Heading, Text } from "@medusajs/ui"+import { ReactNode } from "react"import { useTranslation } from "react-i18next"import { DisplayExtensionZone } from "@mercurjs/dashboard-shared"import { ActionMenu } from "@components/common/action-menu"@@ -9,14 +10,33 @@ type CampaignBudgetProps = {campaign: AdminCampaign}-const BudgetRow = ({ label, value }: { label: string; value: string }) => (- <div className="text-ui-fg-subtle grid grid-cols-2 items-center px-6 py-4">- <Text size="small" leading="compact" weight="plus">- {label}- </Text>- <Text size="small" leading="compact">- {value}- </Text>+const BudgetRow = ({+ label,+ value,+ action,+ divider,+}: {+ label: string+ value: string+ action?: ReactNode+ divider?: boolean+}) => (+ <div+ className={+ divider+ ? "border-b border-ui-border-base"+ : ""+ }+ >+ <div className="bg-ui-bg-component text-ui-fg-subtle grid grid-cols-[minmax(0,1fr)_minmax(0,1fr)_28px] items-center gap-4 px-3 py-2">+ <Text size="small" leading="compact" weight="plus">+ {label}+ </Text>+ <Text size="small" leading="compact">+ {value}+ </Text>+ <div className="flex justify-end">{action}</div>+ </div></div>)@@ -39,53 +59,66 @@ export const CampaignBudget = ({ campaign }: CampaignBudgetProps) => {: "-"return (- <Container className="divide-y p-0">+ <Container className="p-0"><div className="flex items-center justify-between px-6 py-4"><Heading level="h2">{t("campaigns.budget.details")}</Heading>- <ActionMenu- groups={[- {- actions: [- {- icon: <PencilSquare />,- label: t("actions.edit"),- to: "edit-budget",- },- ],- },- ]}- /></div>- <div className="px-6 py-4">- <Text size="small" leading="compact" weight="plus">- {isSpend- ? t("campaigns.budget.type.spend.title")- : t("campaigns.budget.type.usage.title")}- </Text>- <Text size="small" leading="compact" className="text-ui-fg-subtle">- {isSpend- ? t("campaigns.budget.type.spend.description")- : t("campaigns.budget.type.usage.description")}- </Text>+ <div className="flex items-start gap-x-3 px-6 pb-4">+ <div className="text-ui-fg-subtle bg-ui-bg-component shadow-elevation-card-rest flex size-7 shrink-0 items-center justify-center rounded-md">+ {isSpend ? <CurrencyDollar /> : <ChartPie />}+ </div>+ <div>+ <Text size="small" leading="compact" weight="plus">+ {isSpend+ ? t("campaigns.budget.type.spend.title")+ : t("campaigns.budget.type.usage.title")}+ </Text>+ <Text size="small" leading="compact" className="text-ui-fg-subtle">+ {isSpend+ ? t("campaigns.budget.type.spend.description")+ : t("campaigns.budget.type.usage.description")}+ </Text>+ </div></div>- <BudgetRow- label={t("campaigns.fields.total_used")}- value={formatAmount(budget?.used ?? 0)}- />+ <div className="px-3 pb-3">+ <div className="overflow-hidden rounded-xl border border-ui-border-base">+ <BudgetRow+ label={t("campaigns.fields.total_used")}+ value={formatAmount(budget?.used ?? 0)}+ divider+ />- <BudgetRow- label={t("campaigns.fields.budget_limit")}- value={budget?.limit != null ? formatAmount(budget.limit) : "-"}- />+ <BudgetRow+ label={t("campaigns.fields.budget_limit")}+ value={budget?.limit != null ? formatAmount(budget.limit) : "-"}+ divider={!isSpend}+ action={+ <ActionMenu+ groups={[+ {+ actions: [+ {+ icon: <PencilSquare />,+ label: t("actions.edit"),+ to: "edit-budget",+ },+ ],+ },+ ]}+ />+ }+ />- {!isSpend && (- <BudgetRow- label={t("campaigns.budget.fields.budgetAttribute")}- value={attributeLabel}- />- )}+ {!isSpend && (+ <BudgetRow+ label={t("campaigns.budget.fields.budgetAttribute")}+ value={attributeLabel}+ />+ )}+ </div>+ </div><DisplayExtensionZone model="campaign" zone="spend" data={campaign} /><DisplayExtensionZone model="campaign" zone="budget" data={campaign} />diff --git a/packages/vendor/src/pages/campaigns/[id]/_components/campaign-configuration-section/campaign-configuration-section.tsx b/packages/vendor/src/pages/campaigns/[id]/_components/campaign-configuration-section/campaign-configuration-section.tsxindex 6601bd1fe..db2576cbc 100644--- a/packages/vendor/src/pages/campaigns/[id]/_components/campaign-configuration-section/campaign-configuration-section.tsx+++ b/packages/vendor/src/pages/campaigns/[id]/_components/campaign-configuration-section/campaign-configuration-section.tsx@@ -1,5 +1,5 @@import { HttpTypes } from "@medusajs/types"-import { Container, Heading, Text } 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">- <div className="flex items-center justify-between">+ <Container className="p-0">+ <div className="flex items-center justify-between px-6 pt-6"><Heading level="h2">{t("campaigns.configuration.header")}</Heading><ActionMenugroups={[@@ -34,18 +34,15 @@ export const CampaignConfigurationSection = ({]}/></div>- <DateRangeDisplay- startsAt={campaign.starts_at}- endsAt={campaign.ends_at}- showTime- />- <div className="bg-ui-bg-component shadow-elevation-card-rest border-ui-tag-orange-icon flex rounded-lg border-l-2 px-3 py-2">- <Text size="small" leading="compact" className="text-ui-fg-subtle">- <span className="text-ui-fg-base txt-compact-small-plus">- {t("general.warning")}:- </span>{" "}+ <div className="flex flex-col gap-y-4 px-3 pb-3 pt-4">+ <DateRangeDisplay+ startsAt={campaign.starts_at}+ endsAt={campaign.ends_at}+ showTime+ />+ <InlineTip variant="warning" label={t("general.warning")}>{t("campaigns.configuration.expiryWarning")}- </Text>+ </InlineTip></div><DisplayExtensionZonemodel="campaign"diff --git a/packages/vendor/src/pages/campaigns/[id]/_components/campaign-general-section/campaign-general-section.tsx b/packages/vendor/src/pages/campaigns/[id]/_components/campaign-general-section/campaign-general-section.tsxindex 1705eaf7e..e5ab0a00e 100644--- a/packages/vendor/src/pages/campaigns/[id]/_components/campaign-general-section/campaign-general-section.tsx+++ b/packages/vendor/src/pages/campaigns/[id]/_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,@@ -142,28 +140,6 @@ export const CampaignGeneralSection = ({</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">- <Text size="small" leading="compact" weight="plus">- {t("fields.currency")}- </Text>-- <div>- <Badge size="xsmall">{campaign?.budget.currency_code}</Badge>- <Text className="inline pl-3" size="small" leading="compact">- {currencies[campaign?.budget.currency_code?.toUpperCase()]?.name}- </Text>- </div>- </div>- </DisplayField>- )}-<DisplayExtensionZonemodel="campaign"zone="general"@@ -173,7 +149,6 @@ export const CampaignGeneralSection = ({"status","campaign_identifier","description",- "currency_code",]}/></Container>diff --git a/packages/vendor/src/pages/campaigns/[id]/_components/campaign-promotion-section/campaign-promotion-section.tsx b/packages/vendor/src/pages/campaigns/[id]/_components/campaign-promotion-section/campaign-promotion-section.tsxindex a55851dfa..2eab84a51 100644--- a/packages/vendor/src/pages/campaigns/[id]/_components/campaign-promotion-section/campaign-promotion-section.tsx+++ b/packages/vendor/src/pages/campaigns/[id]/_components/campaign-promotion-section/campaign-promotion-section.tsx@@ -16,7 +16,10 @@ import { Link } from "react-router-dom"import { DisplayExtensionZone } from "@mercurjs/dashboard-shared"import { ActionMenu } from "@components/common/action-menu"import { _DataTable } from "@components/table/data-table"-import { useRemovePromotionFromCampaign } from "@hooks/api/promotions"+import {+ usePromotions,+ useRemovePromotionFromCampaign,+} from "@hooks/api/promotions"import { fetchQuery } from "@lib/client"import { queryClient } from "@lib/query-client"import { campaignsQueryKeys } from "@hooks/api/campaigns"@@ -39,18 +42,22 @@ export const CampaignPromotionSection = ({const { t } = useTranslation()const prompt = usePrompt()const columns = useColumns()- const filters = usePromotionTableFilters()- const { raw } = usePromotionTableQuery({+ const filters = usePromotionTableFilters().filter(+ (filter) => filter.key !== "campaign_id"+ )+ const { raw, searchParams } = usePromotionTableQuery({pageSize: PAGE_SIZE,})- const promotions = campaign.promotions- const count = promotions?.length ?? 0+ const { promotions, count, isLoading } = usePromotions({+ ...searchParams,+ campaign_id: campaign.id,+ })const { table } = useDataTable({- data: promotions ?? [],+ data: (promotions ?? []) as unknown as AdminPromotion[],columns,- count,+ count: count ?? 0,getRowId: (row) => row.id,enablePagination: true,enableRowSelection: true,@@ -72,7 +79,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"),})@@ -120,8 +127,8 @@ export const CampaignPromotionSection = ({table={table}columns={columns}pageSize={PAGE_SIZE}- isLoading={false}- count={count}+ isLoading={isLoading}+ count={count ?? 0}navigateTo={(row) => `/promotions/${row.id}`}filters={filters}search@@ -147,6 +154,7 @@ export const CampaignPromotionSection = ({},]}noRecords={{+ title: t("campaigns.promotions.list.noRecordsTitle"),message: t("campaigns.promotions.list.noRecordsMessage"),}}/>@@ -174,7 +182,7 @@ const PromotionActions = ({ promotion }: { promotion: AdminPromotion }) => {description: t("campaigns.promotions.remove.description", {count: 1,}),- confirmText: t("actions.continue"),+ confirmText: t("actions.remove"),cancelText: t("actions.cancel"),})@@ -251,7 +259,7 @@ const useColumns = () => {)},}),- ...columns,+ ...columns.filter((column) => column.id !== "campaign"),columnHelper.display({id: "actions",cell: ({ row }) => {diff --git a/packages/vendor/src/pages/campaigns/[id]/campaign-detail-page.tsx b/packages/vendor/src/pages/campaigns/[id]/campaign-detail-page.tsxindex 1a3757e7a..655aa5b90 100644--- a/packages/vendor/src/pages/campaigns/[id]/campaign-detail-page.tsx+++ b/packages/vendor/src/pages/campaigns/[id]/campaign-detail-page.tsx@@ -5,7 +5,6 @@ import { TwoColumnPageSkeleton } from "@components/common/skeleton";import { TwoColumnPage } from "@components/layout/pages";import { WidgetZone, useLinkQuery } from "@mercurjs/dashboard-shared";import { useCampaign } from "@hooks/api/campaigns";-import { usePromotionTableQuery } from "@hooks/table/query/use-promotion-table-query";import { CampaignBudget } from "./_components/campaign-budget";import { CampaignConfigurationSection } from "./_components/campaign-configuration-section";@@ -18,11 +17,10 @@ import type { loader } from "./loader";const Root = ({ children }: { children?: ReactNode }) => {const initialData = useLoaderData() as Awaited<ReturnType<typeof loader>>;const { id } = useParams();- const { searchParams } = usePromotionTableQuery({});const linkQuery = useLinkQuery("campaign", CAMPAIGN_DETAIL_FIELDS);const { campaign, isLoading, isError, error } = useCampaign(id!,- { ...searchParams, ...linkQuery },+ { ...linkQuery },{placeholderData: initialData,},diff --git a/packages/vendor/src/pages/campaigns/[id]/configuration/campaign-configuration-form/campaign-configuration-form.tsx b/packages/vendor/src/pages/campaigns/[id]/configuration/campaign-configuration-form/campaign-configuration-form.tsxindex 72e018c2f..a32abcd47 100644--- a/packages/vendor/src/pages/campaigns/[id]/configuration/campaign-configuration-form/campaign-configuration-form.tsx+++ b/packages/vendor/src/pages/campaigns/[id]/configuration/campaign-configuration-form/campaign-configuration-form.tsx@@ -69,7 +69,9 @@ export const CampaignConfigurationForm = ({render={({ field }) => {return (<Form.Item>- <Form.Label>{t("campaigns.fields.start_date")}</Form.Label>+ <Form.Label optional>+ {t("campaigns.fields.start_date")}+ </Form.Label><Form.Control><DatePicker@@ -92,7 +94,9 @@ export const CampaignConfigurationForm = ({render={({ field }) => {return (<Form.Item>- <Form.Label>{t("campaigns.fields.end_date")}</Form.Label>+ <Form.Label optional>+ {t("campaigns.fields.end_date")}+ </Form.Label><Form.Control><DatePickerdiff --git a/packages/vendor/src/pages/campaigns/[id]/edit-budget/edit-campaign-budget-form/edit-campaign-budget-form.tsx b/packages/vendor/src/pages/campaigns/[id]/edit-budget/edit-campaign-budget-form/edit-campaign-budget-form.tsxindex f82f0352c..b10699b2e 100644--- a/packages/vendor/src/pages/campaigns/[id]/edit-budget/edit-campaign-budget-form/edit-campaign-budget-form.tsx+++ b/packages/vendor/src/pages/campaigns/[id]/edit-budget/edit-campaign-budget-form/edit-campaign-budget-form.tsx@@ -68,7 +68,7 @@ export const EditCampaignBudgetForm = ({render={({ field: { onChange, value, ...field } }) => {return (<Form.Item className="basis-1/2">- <Form.Label>+ <Form.Label optional>{t("campaigns.budget.fields.limit")}</Form.Label>diff --git a/packages/vendor/src/pages/campaigns/[id]/edit/edit-campaign-form/edit-campaign-form.tsx b/packages/vendor/src/pages/campaigns/[id]/edit/edit-campaign-form/edit-campaign-form.tsxindex 30edd3739..705b24172 100644--- a/packages/vendor/src/pages/campaigns/[id]/edit/edit-campaign-form/edit-campaign-form.tsx+++ b/packages/vendor/src/pages/campaigns/[id]/edit/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,8 +45,6 @@ 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 }) => {@@ -92,24 +86,6 @@ export const EditCampaignForm = ({ campaign }: EditCampaignFormProps) => {}}/>- <Form.Field- control={form.control}- name="description"- render={({ field }) => {- return (- <Form.Item>- <Form.Label>{t("fields.description")}</Form.Label>-- <Form.Control>- <Input {...field} />- </Form.Control>-- <Form.ErrorMessage />- </Form.Item>- )- }}- />-<Form.Fieldcontrol={form.control}name="campaign_identifier"@@ -130,41 +106,14 @@ export const EditCampaignForm = ({ campaign }: EditCampaignFormProps) => {<Form.Fieldcontrol={form.control}- name="starts_at"- render={({ field }) => {- return (- <Form.Item>- <Form.Label>{t("campaigns.fields.start_date")}</Form.Label>-- <Form.Control>- <DatePicker- granularity="minute"- hourCycle={12}- shouldCloseOnSelect={false}- {...field}- />- </Form.Control>-- <Form.ErrorMessage />- </Form.Item>- )- }}- />-- <Form.Field- control={form.control}- name="ends_at"+ name="description"render={({ field }) => {return (<Form.Item>- <Form.Label>{t("campaigns.fields.end_date")}</Form.Label>+ <Form.Label optional>{t("fields.description")}</Form.Label><Form.Control>- <DatePicker- granularity="minute"- shouldCloseOnSelect={false}- {...field}- />+ <Input {...field} /></Form.Control><Form.ErrorMessage />diff --git a/packages/vendor/src/pages/campaigns/_components/campaign-list-table/campaign-list-data-table.tsx b/packages/vendor/src/pages/campaigns/_components/campaign-list-table/campaign-list-data-table.tsxindex 5de78836b..0d93f9a97 100644--- a/packages/vendor/src/pages/campaigns/_components/campaign-list-table/campaign-list-data-table.tsx+++ b/packages/vendor/src/pages/campaigns/_components/campaign-list-table/campaign-list-data-table.tsx@@ -82,12 +82,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"),});diff --git a/packages/vendor/src/pages/campaigns/common/components/create-campaign-form-fields/create-campaign-form-fields.tsx b/packages/vendor/src/pages/campaigns/common/components/create-campaign-form-fields/create-campaign-form-fields.tsxindex f22d160f7..881ec92f8 100644--- a/packages/vendor/src/pages/campaigns/common/components/create-campaign-form-fields/create-campaign-form-fields.tsx+++ b/packages/vendor/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,@@ -206,7 +207,9 @@ export const CreateCampaignFormFields = <T extends CampaignFormFields | WithNest/></div>- <div>+ <Divider variant="dashed" data-testid="campaign-create-form-fields-budget-divider" />++ <div data-testid="campaign-create-form-fields-budget-header"><Heading>{t("campaigns.budget.create.header")}</Heading><Text size="small" className="text-ui-fg-subtle">{t("campaigns.budget.create.hint")}@@ -231,7 +234,7 @@ export const CreateCampaignFormFields = <T extends CampaignFormFields | WithNest<Form.Control><RadioGroup- className="flex gap-y-3"+ className="grid grid-cols-2 gap-4"{...field}value={field.value as string}onValueChange={field.onChange}@@ -280,8 +283,10 @@ export const CreateCampaignFormFields = <T extends CampaignFormFields | WithNestonValueChange={onChange}disabled={!!fieldScope?.length}>- <Select.Trigger ref={ref}>- <Select.Value />+ <Select.Trigger ref={ref} className="w-full">+ <Select.Value+ placeholder={t("campaigns.budget.fields.selectCurrency")}+ /></Select.Trigger><Select.Content>@@ -315,8 +320,9 @@ export const CreateCampaignFormFields = <T extends CampaignFormFields | WithNestname={`${fieldScope}budget.limit` as Path<T>}render={({ field: { onChange, value, ...field } }) => {return (- <Form.Item className="basis-1/2">+ <Form.Item><Form.Label+ optionaltooltip={!currency && isTypeSpend? t("promotions.fields.amount.tooltip")@@ -370,7 +376,7 @@ export const CreateCampaignFormFields = <T extends CampaignFormFields | WithNestname={`${fieldScope}budget.attribute` as Path<T>}render={({ field }) => {return (- <Form.Item className="basis-1/2">+ <Form.Item><Form.Labeloptionaltooltip={t("campaigns.budget.fields.budgetAttributeTooltip")}@@ -380,6 +386,7 @@ export const CreateCampaignFormFields = <T extends CampaignFormFields | WithNest<Form.Control><Combobox+ className="w-full"key="attribute"{...field}value={(field.value as string | undefined) ?? undefined}